@stll/folio-core 0.11.0 → 0.13.0

package/dist/docx/styleParser.js

@@ -1,8 +1,8 @@
-import { findChild, findChildren, getAttribute, getLocalName, parseBooleanElement, parseNumericAttribute, parseTableMeasurementValue, parseXmlDocument } from "./xmlParser.js";
 import { BorderStyleSchema, ConditionalStyleTypeSchema, EmphasisMarkSchema, FontThemeSchema, HighlightColorSchema, LineSpacingRuleSchema, ParagraphAlignmentSchema, ShadingPatternSchema, StyleTypeSchema, TabLeaderSchema, TabStopAlignmentSchema, TableCellTextDirectionSchema, TableRowHeightRuleSchema, TableWidthTypeSchema, TextEffectSchema, ThemeColorSlotSchema, UnderlineStyleSchema, narrowEnum } from "./parserEnums.js";
-import { resolveThemeFontRef } from "./themeParser.js";
+import { findChild, findChildren, getAttribute, getLocalName, parseBooleanElement, parseNumericAttribute, parseTableMeasurementValue, parseXmlDocument } from "./xmlParser.js";
 import { mergeTextFormatting } from "../utils/textFormattingMerge.js";
 import { mergeParagraphFormatting } from "../utils/paragraphFormattingMerge.js";
+import { resolveThemeFontRef } from "./themeParser.js";
 //#region src/docx/styleParser.ts
 /**
 * Parse text formatting properties (w:rPr)
@@ -263,6 +263,8 @@ function parseParagraphProperties(pPr, theme) {
 	}
 	const bidi = findChild(pPr, "w", "bidi");
 	if (bidi) formatting.bidi = parseBooleanElement(bidi);
+	const snapToGrid = findChild(pPr, "w", "snapToGrid");
+	if (snapToGrid) formatting.snapToGrid = parseBooleanElement(snapToGrid);
 	const spacing = findChild(pPr, "w", "spacing");
 	if (spacing) {
 		const before = parseNumericAttribute(spacing, "w", "before");

package/dist/docx/tableParser.d.ts

@@ -4,6 +4,13 @@ import { StyleMap } from "./styleParser.js";
 import { XmlElement } from "./xmlParser.js";
 
 //#region src/docx/tableParser.d.ts
+/**
+ * Sanity cap on `w:gridSpan` (and the derived table column count). Word's
+ * practical column limit is 63; a hostile/corrupt value here would blow up
+ * every downstream structure sized by column count (TableMap, border grids,
+ * cell-grid arrays).
+ */
+declare const MAX_TABLE_COLUMNS = 63;
 /**
  * Parse a table measurement (width, height, etc.)
  *
@@ -199,4 +206,4 @@ declare function getHeaderRows(table: document_d_exports.Table): document_d_expo
  */
 declare function isFloatingTable(table: document_d_exports.Table): boolean;
 //#endregion
-export { getHeaderRows, getTableColumnCount, getTableRowCount, getTableText, hasHeaderRow, isCellHorizontallyMerged, isCellMergeContinuation, isCellMergeStart, isFloatingTable, parseBorderSpec, parseCellMargins, parseConditionalFormatStyle, parseFloatingTableProperties, parseShading, parseTable, parseTableBorders, parseTableCell, parseTableCellProperties, parseTableGrid, parseTableLook, parseTableMeasurement, parseTableProperties, parseTableRow, parseTableRowProperties };
+export { MAX_TABLE_COLUMNS, getHeaderRows, getTableColumnCount, getTableRowCount, getTableText, hasHeaderRow, isCellHorizontallyMerged, isCellMergeContinuation, isCellMergeStart, isFloatingTable, parseBorderSpec, parseCellMargins, parseConditionalFormatStyle, parseFloatingTableProperties, parseShading, parseTable, parseTableBorders, parseTableCell, parseTableCellProperties, parseTableGrid, parseTableLook, parseTableMeasurement, parseTableProperties, parseTableRow, parseTableRowProperties };

package/dist/docx/tableParser.js

@@ -1,11 +1,19 @@
+import { BorderStyleSchema, FloatingTableXSpecSchema, FloatingTableYSpecSchema, ShadingPatternSchema, TableCellTextDirectionSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.js";
 import { findChild, findChildByLocalName, findChildren, getAttribute, getChildElements, mergeXmlnsDeclarations, parseBooleanElement, parseNumericAttribute, parseTableMeasurementValue } from "./xmlParser.js";
 import { parseBookmarkEnd, parseBookmarkStart } from "./bookmarkParser.js";
-import { BorderStyleSchema, FloatingTableXSpecSchema, FloatingTableYSpecSchema, ShadingPatternSchema, TableCellTextDirectionSchema, ThemeColorSlotSchema, narrowEnum } from "./parserEnums.js";
 import { parseParagraph } from "./paragraphParser.js";
 import { appendBookmarkMarkerToLastParagraphInBlocks, appendBookmarkMarkerToLastParagraphInCells, prependBookmarkMarkersToFirstParagraphInBlocks, prependBookmarkMarkersToFirstParagraphInCell } from "./bookmarkPlacement.js";
 import { enrichParagraphTextBoxes } from "./paragraphTextBoxEnrichment.js";
+import { normalizeRevisionId } from "@stll/docx-core/model";
 //#region src/docx/tableParser.ts
 /**
+* Sanity cap on `w:gridSpan` (and the derived table column count). Word's
+* practical column limit is 63; a hostile/corrupt value here would blow up
+* every downstream structure sized by column count (TableMap, border grids,
+* cell-grid arrays).
+*/
+const MAX_TABLE_COLUMNS = 63;
+/**
 * Parse a table measurement (width, height, etc.)
 *
 * @param element - Element with w:w and w:type attributes
@@ -32,11 +40,13 @@ function parseTrackedChangeInfo(node) {
 	const parsedId = rawId ? Number.parseInt(rawId, 10) : 0;
 	const author = (getAttribute(node, "w", "author") ?? "").trim();
 	const date = (getAttribute(node, "w", "date") ?? "").trim();
+	const initials = (getAttribute(node, "w", "initials") ?? "").trim();
 	const info = {
-		id: Number.isInteger(parsedId) && parsedId >= 0 ? parsedId : 0,
+		id: normalizeRevisionId(parsedId),
 		author: author.length > 0 ? author : "Unknown"
 	};
 	if (date.length > 0) info.date = date;
+	if (initials.length > 0) info.initials = initials;
 	return info;
 }
 function parsePropertyChangeInfo(node) {
@@ -349,10 +359,20 @@ function parseTableCellStructuralChange(tcPrElement) {
 		info: parseTrackedChangeInfo(deletion)
 	};
 	const merge = findChild(tcPrElement, "w", "cellMerge");
-	if (merge) return {
-		type: "tableCellMerge",
-		info: parseTrackedChangeInfo(merge)
-	};
+	if (merge) {
+		const verticalMerge = parseTableCellVerticalMergeRevisionValue(getAttribute(merge, "w", "vMerge"));
+		const verticalMergeOriginal = parseTableCellVerticalMergeRevisionValue(getAttribute(merge, "w", "vMergeOrig"));
+		return {
+			type: "tableCellMerge",
+			info: parseTrackedChangeInfo(merge),
+			...verticalMerge !== void 0 ? { verticalMerge } : {},
+			...verticalMergeOriginal !== void 0 ? { verticalMergeOriginal } : {}
+		};
+	}
+}
+function parseTableCellVerticalMergeRevisionValue(value) {
+	if (value === "cont") return "continue";
+	if (value === "rest") return "rest";
 }
 /**
 * Parse table row properties (w:trPr)
@@ -475,14 +495,15 @@ function parseTableCellProperties(tcPrElement) {
 	const gridSpanElement = findChild(tcPrElement, "w", "gridSpan");
 	if (gridSpanElement) {
 		const gridSpan = parseNumericAttribute(gridSpanElement, "w", "val");
-		if (gridSpan !== void 0 && gridSpan > 1) formatting.gridSpan = gridSpan;
+		if (gridSpan !== void 0 && gridSpan > 1) formatting.gridSpan = Math.min(gridSpan, 63);
 	}
 	const vMergeElement = findChild(tcPrElement, "w", "vMerge");
 	if (vMergeElement) if (getAttribute(vMergeElement, "w", "val") === "restart") formatting.vMerge = "restart";
 	else formatting.vMerge = "continue";
 	if (parseBooleanElement(findChild(tcPrElement, "w", "tcFitText"))) formatting.fitText = true;
 	if (parseBooleanElement(findChild(tcPrElement, "w", "noWrap"))) formatting.noWrap = true;
-	if (parseBooleanElement(findChild(tcPrElement, "w", "hideMark"))) formatting.hideMark = true;
+	const hideMark = parseBooleanElement(findChild(tcPrElement, "w", "hideMark"));
+	if (hideMark !== void 0) formatting.hideMark = hideMark;
 	const conditionalFormat = parseConditionalFormatStyle(findChild(tcPrElement, "w", "cnfStyle"));
 	if (conditionalFormat) formatting.conditionalFormat = conditionalFormat;
 	if (Object.keys(formatting).length === 0) return;
@@ -508,7 +529,7 @@ function parseCellContent(tcElement, styles, theme, numbering, rels, media, opti
 		const localName = getLocalName(child.name);
 		if (localName === "p") {
 			const para = parseParagraph(child, styles, theme, numbering, rels, media, options);
-			enrichParagraphTextBoxes(para, child, styles, theme, numbering, rels, media);
+			enrichParagraphTextBoxes(para, child, styles, theme, numbering, rels, media, parseTable);
 			prependPendingBookmarkMarkers(para, pendingBookmarkMarkers);
 			content.push(para);
 		} else if (localName === "tbl") {
@@ -827,4 +848,4 @@ function isFloatingTable(table) {
 	return table.formatting?.floating !== void 0;
 }
 //#endregion
-export { getHeaderRows, getTableColumnCount, getTableRowCount, getTableText, hasHeaderRow, isCellHorizontallyMerged, isCellMergeContinuation, isCellMergeStart, isFloatingTable, parseBorderSpec, parseCellMargins, parseConditionalFormatStyle, parseFloatingTableProperties, parseShading, parseTable, parseTableBorders, parseTableCell, parseTableCellProperties, parseTableGrid, parseTableLook, parseTableMeasurement, parseTableProperties, parseTableRow, parseTableRowProperties };
+export { MAX_TABLE_COLUMNS, getHeaderRows, getTableColumnCount, getTableRowCount, getTableText, hasHeaderRow, isCellHorizontallyMerged, isCellMergeContinuation, isCellMergeStart, isFloatingTable, parseBorderSpec, parseCellMargins, parseConditionalFormatStyle, parseFloatingTableProperties, parseShading, parseTable, parseTableBorders, parseTableCell, parseTableCellProperties, parseTableGrid, parseTableLook, parseTableMeasurement, parseTableProperties, parseTableRow, parseTableRowProperties };

package/dist/docx/textBoxParser.d.ts

@@ -15,16 +15,16 @@ declare function extractTextBoxContentElements(txbxContent: XmlElement | null):
 /**
  * Type for the paragraph parser function to avoid circular imports
  */
-type ParagraphParserFn = (node: XmlElement, styles: StyleMap | null, theme: document_d_exports.Theme | null, numbering: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null) => document_d_exports.Paragraph;
+type ParagraphParserFn = (node: XmlElement, styles: StyleMap | null, theme: document_d_exports.Theme | null, numbering: NumberingMap | null, rels: document_d_exports.RelationshipMap | null, media: Map<string, document_d_exports.MediaFile> | null) => document_d_exports.Paragraph;
 /**
  * Type for the table parser function to avoid circular imports
  */
-type TableParserFn = (node: XmlElement, styles: StyleMap | null, theme: document_d_exports.Theme | null, numbering: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null, media?: Map<string, document_d_exports.MediaFile>) => document_d_exports.Table;
+type TableParserFn = (node: XmlElement, styles: StyleMap | null, theme: document_d_exports.Theme | null, numbering: NumberingMap | null, rels: document_d_exports.RelationshipMap | null, media: Map<string, document_d_exports.MediaFile> | null) => document_d_exports.Table;
 /**
  * Parse text box content with provided parser functions
  * This avoids circular dependencies by accepting parser functions as parameters
  */
-declare function parseTextBoxContent(txbxContent: XmlElement | null, parseParagraph: ParagraphParserFn, parseTable: TableParserFn | null, styles: StyleMap | null, theme: document_d_exports.Theme | null, numbering: NumberingMap | null, rels?: document_d_exports.RelationshipMap | null, _media?: Map<string, document_d_exports.MediaFile>): document_d_exports.Paragraph[];
+declare function parseTextBoxContent(txbxContent: XmlElement | null, parseParagraph: ParagraphParserFn, parseTable: TableParserFn | null, styles: StyleMap | null, theme: document_d_exports.Theme | null, numbering: NumberingMap | null, rels: document_d_exports.RelationshipMap | null, media: Map<string, document_d_exports.MediaFile> | null): (document_d_exports.Paragraph | document_d_exports.Table)[];
 /**
  * Check if a drawing element contains a text box
  * Text boxes are shapes with wps:txbx content

package/dist/docx/textBoxParser.js

@@ -44,20 +44,20 @@ function extractTextBoxContentElements(txbxContent) {
 * Parse text box content with provided parser functions
 * This avoids circular dependencies by accepting parser functions as parameters
 */
-function parseTextBoxContent(txbxContent, parseParagraph, parseTable, styles, theme, numbering, rels, _media) {
+function parseTextBoxContent(txbxContent, parseParagraph, parseTable, styles, theme, numbering, rels, media) {
 	if (!txbxContent) return [];
-	const paragraphs = [];
+	const blocks = [];
 	const children = getChildElements(txbxContent);
 	for (const child of children) {
 		const name = child.name || "";
 		const colonIdx = name.indexOf(":");
 		const localName = colonIdx !== -1 ? name.slice(colonIdx + 1) : name;
 		if (localName === "p") {
-			const paragraph = parseParagraph(child, styles, theme, numbering, rels);
-			paragraphs.push(paragraph);
-		} else if (localName === "tbl" && parseTable) {}
+			const paragraph = parseParagraph(child, styles, theme, numbering, rels, media);
+			blocks.push(paragraph);
+		} else if (localName === "tbl" && parseTable) blocks.push(parseTable(child, styles, theme, numbering, rels, media));
 	}
-	return paragraphs;
+	return blocks;
 }
 /**
 * Check if a drawing element contains a text box
@@ -232,16 +232,20 @@ function hasTextBoxContent(textBox) {
 * Get plain text from text box (helper for search/indexing)
 */
 function getTextBoxText(textBox) {
-	const parts = [];
-	for (const paragraph of textBox.content) {
+	return textBox.content.map(getTextBoxBlockText).join("\n");
+}
+const getTextBoxBlockText = (block) => {
+	if (block.type === "paragraph") {
 		const runTexts = [];
-		for (const item of paragraph.content) if (item.type === "run") {
+		for (const item of block.content) {
+			if (item.type !== "run") continue;
 			for (const content of item.content) if (content.type === "text") runTexts.push(content.text);
 		}
-		parts.push(runTexts.join(""));
+		return runTexts.join("");
 	}
-	return parts.join("\n");
-}
+	if (block.type === "table") return block.rows.map((row) => row.cells.map((cell) => cell.content.map(getTextBoxBlockText).join("\n")).join("	")).join("\n");
+	return block.content.map(getTextBoxBlockText).join("\n");
+};
 /**
 * Resolve fill color to CSS color string
 */

package/dist/docx/unzip.js

@@ -261,6 +261,7 @@ function isPreservableDocxEntry(path) {
 	if (!isSafeDocxPath(path)) return false;
 	const lowerPath = path.toLowerCase();
 	if (lowerPath.startsWith("word/media/")) return PRESERVABLE_MEDIA_MIME_TYPES.has(getMediaMimeType(path));
+	if (lowerPath.startsWith("docprops/thumbnail.")) return PRESERVABLE_MEDIA_MIME_TYPES.has(getMediaMimeType(path));
 	if (lowerPath.startsWith("word/fonts/")) return true;
 	if (!(lowerPath.endsWith(".xml") || lowerPath.endsWith(".rels"))) return false;
 	return lowerPath === "[content_types].xml" || lowerPath.startsWith("_rels/") || lowerPath.startsWith("docprops/") || lowerPath.startsWith("word/") || lowerPath.startsWith("customxml/");

package/dist/docx/vmlImageParser.js

@@ -1,5 +1,6 @@
 import { cloneWithXmlnsDeclarations, elementToXml, findAllDeep, findChild, getAttribute, getChildElements, getLocalName } from "./xmlParser.js";
 import { pixelsToEmu } from "../utils/units.js";
+import { sanitizeImageSrc } from "../utils/sanitizeImageSrc.js";
 import { resolveImageData } from "./imageParser.js";
 import { isWatermarkShape } from "./watermarkParser.js";
 //#region src/docx/vmlImageParser.ts
@@ -49,16 +50,22 @@ function cssLengthToPx(raw) {
 		default: return;
 	}
 }
+const PROTOTYPE_POLLUTION_KEYS = /* @__PURE__ */ new Set([
+	"__proto__",
+	"constructor",
+	"prototype"
+]);
 /** Read a `style="k1:v1;k2:v2"` attribute into a lowercased key/value record. */
 function parseStyleAttr(style) {
-	const out = {};
+	const out = Object.create(null);
 	if (!style) return out;
 	for (const decl of style.split(";")) {
 		const colon = decl.indexOf(":");
 		if (colon < 0) continue;
 		const key = decl.slice(0, colon).trim().toLowerCase();
 		const value = decl.slice(colon + 1).trim();
-		if (key) out[key] = value;
+		if (!key || PROTOTYPE_POLLUTION_KEYS.has(key)) continue;
+		out[key] = value;
 	}
 	return out;
 }
@@ -216,7 +223,8 @@ function parseVmlImageContent(pictElement, rels, media, rootXmlns = {}) {
 			},
 			wrap: { type: "inline" }
 		};
-		if (src) image.src = src;
+		const safeSrc = sanitizeImageSrc(src);
+		if (safeSrc) image.src = safeSrc;
 		if (mimeType) image.mimeType = mimeType;
 		if (filename) image.filename = filename;
 		const title = getAttribute(imagedata, "o", "title");

package/dist/docx/xmlParser.js

@@ -500,6 +500,13 @@ function findAllDeep(root, namespace, localName) {
 	return results;
 }
 /**
+* Sanity cap on distinct `xmlns:*` declarations collected per element. Real
+* documents declare a handful; a hostile element with thousands of unique
+* prefixes would otherwise get replayed onto every captured `w:pict` rawXml
+* subtree that inherits from it.
+*/
+const MAX_XMLNS_DECLARATIONS_PER_ELEMENT = 64;
+/**
 * Collect every `xmlns` / `xmlns:*` declaration from an element's attributes.
 *
 * The serializer's hard-coded root namespaces only cover canonical prefixes
@@ -512,7 +519,10 @@ function collectXmlnsDeclarations(element) {
 	const out = {};
 	const attrs = element.attributes;
 	if (!attrs) return out;
-	for (const [key, value] of Object.entries(attrs)) if ((key === "xmlns" || key.startsWith("xmlns:")) && value !== void 0) out[key] = String(value);
+	for (const [key, value] of Object.entries(attrs)) {
+		if (Object.keys(out).length >= MAX_XMLNS_DECLARATIONS_PER_ELEMENT) break;
+		if ((key === "xmlns" || key.startsWith("xmlns:")) && value !== void 0) out[key] = String(value);
+	}
 	return out;
 }
 /**

package/dist/docx/xmlSafety.d.ts

@@ -0,0 +1,5 @@
+//#region src/docx/xmlSafety.d.ts
+type DocxXmlSafetyIssue = "doctype-forbidden" | "not-well-formed";
+declare const getDocxXmlSafetyIssue: (xml: string) => DocxXmlSafetyIssue | null;
+//#endregion
+export { DocxXmlSafetyIssue, getDocxXmlSafetyIssue };

package/dist/docx/xmlSafety.js

@@ -0,0 +1,9 @@
+import { XMLValidator } from "fast-xml-parser";
+//#region src/docx/xmlSafety.ts
+const DOCTYPE_PATTERN = /<!DOCTYPE(?:\s|>)/iu;
+const getDocxXmlSafetyIssue = (xml) => {
+	if (DOCTYPE_PATTERN.test(xml)) return "doctype-forbidden";
+	return XMLValidator.validate(xml) === true ? null : "not-well-formed";
+};
+//#endregion
+export { getDocxXmlSafetyIssue };

package/dist/fields/resolveFieldValues.js

@@ -196,9 +196,7 @@ function collectFieldRuns(block, out) {
 	if (block.kind === "paragraph") {
 		for (const run of block.runs) if (run.kind === "field") out.push(run);
 	} else if (block.kind === "table") for (const row of block.rows) for (const cell of row.cells) for (const cellBlock of cell.blocks) collectFieldRuns(cellBlock, out);
-	else if (block.kind === "textBox") {
-		for (const paragraph of block.content) for (const run of paragraph.runs) if (run.kind === "field") out.push(run);
-	}
+	else if (block.kind === "textBox") for (const child of block.content) collectFieldRuns(child, out);
 }
 //#endregion
 export { buildHeaderFooterFieldValues, fieldValuesEqual, resolveFieldValues };

package/dist/fonts/embeddedFonts.d.ts

@@ -15,9 +15,24 @@
  *
  * Ported from eigenpal/docx-editor (see NOTICE.md).
  */
+/**
+ * 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.
+ */
+declare function scopeEmbeddedFontFamily(docNonce: string, originalFamily: string): string;
 /** A single de-obfuscated embedded font face, ready to register as `@font-face`. */
 type EmbeddedFont = {
-  /** Word font name to register the face under (`w:font w:name`). */family: string; /** CSS `font-style` the face maps to (`embed*Italic` → `italic`). */
+  /**
+   * Family name to register the face under (`@font-face`/`FontFace`).
+   * Always a per-document SCOPED name (see {@link scopeEmbeddedFontFamily}) —
+   * never the raw `w:font w:name` from the DOCX. Use `originalFamily` (and
+   * {@link buildEmbeddedFontFamilyMap}) to resolve document runs, which
+   * still reference the font by its original DOCX name, to this family.
+   */
+  family: string; /** Original Word font name (`w:font w:name`), before scoping. */
+  originalFamily: string; /** CSS `font-style` the face maps to (`embed*Italic` → `italic`). */
   style: "normal" | "italic"; /** CSS `font-weight` the face maps to (`embedBold*` → `700`). */
   weight: 400 | 700; /** De-obfuscated OpenType/TrueType bytes (backed by a fresh, non-shared buffer). */
   bytes: Uint8Array<ArrayBuffer>; /** Whether the source face was subsetted (`w:subsetted`). */
@@ -33,14 +48,27 @@ type EmbeddedFontParts = {
  * 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.
+ */
+declare function getEmbeddedFontFaces(parts: EmbeddedFontParts, docNonce?: string): EmbeddedFont[];
+/**
+ * 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`.
  */
-declare function getEmbeddedFontFaces(parts: EmbeddedFontParts): EmbeddedFont[];
+declare function buildEmbeddedFontFamilyMap(faces: readonly EmbeddedFont[]): Map<string, string>;
 /**
  * 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`.
  */
-declare function extractEmbeddedFonts(buffer: ArrayBuffer): Promise<EmbeddedFont[]>;
+declare function extractEmbeddedFonts(buffer: ArrayBuffer, docNonce?: string): Promise<EmbeddedFont[]>;
 //#endregion
-export { EmbeddedFont, EmbeddedFontParts, extractEmbeddedFonts, getEmbeddedFontFaces };
+export { EmbeddedFont, EmbeddedFontParts, buildEmbeddedFontFamilyMap, extractEmbeddedFonts, getEmbeddedFontFaces, scopeEmbeddedFontFamily };

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/i18n/messages/catalogs.gen.d.ts

@@ -493,6 +493,7 @@ declare const CATALOGS: {
         readonly rowDeleted: "Row deleted";
         readonly rowInserted: "Row inserted";
         readonly rowPropertiesChanged: "Row formatting changed";
+        readonly runPropertiesChanged: "Text formatting changed";
         readonly tableDeleted: "Table deleted";
         readonly tableInserted: "Table inserted";
         readonly tablePropertiesChanged: "Table formatting changed";
@@ -1135,6 +1136,7 @@ declare const CATALOGS: {
         readonly rowDeleted: "Zeile gelöscht";
         readonly rowInserted: "Zeile eingefügt";
         readonly rowPropertiesChanged: "Zeilenformatierung geändert";
+        readonly runPropertiesChanged: "Textformatierung geändert";
         readonly tableDeleted: "Tabelle gelöscht";
         readonly tableInserted: "Tabelle eingefügt";
         readonly tablePropertiesChanged: "Tabellenformatierung geändert";
@@ -1777,6 +1779,7 @@ declare const CATALOGS: {
         readonly rowDeleted: "Ligne supprimée";
         readonly rowInserted: "Ligne insérée";
         readonly rowPropertiesChanged: "Mise en forme de ligne modifiée";
+        readonly runPropertiesChanged: "Mise en forme du texte modifiée";
         readonly tableDeleted: "Tableau supprimé";
         readonly tableInserted: "Tableau inséré";
         readonly tablePropertiesChanged: "Mise en forme de tableau modifiée";
@@ -2419,6 +2422,7 @@ declare const CATALOGS: {
         readonly rowDeleted: "Fila eliminada";
         readonly rowInserted: "Fila insertada";
         readonly rowPropertiesChanged: "Formato de fila cambiado";
+        readonly runPropertiesChanged: "Formato de texto cambiado";
         readonly tableDeleted: "Tabla eliminada";
         readonly tableInserted: "Tabla insertada";
         readonly tablePropertiesChanged: "Formato de tabla cambiado";
@@ -3061,6 +3065,7 @@ declare const CATALOGS: {
         readonly rowDeleted: "Řádek odstraněn";
         readonly rowInserted: "Řádek vložen";
         readonly rowPropertiesChanged: "Formátování řádku změněno";
+        readonly runPropertiesChanged: "Formátování textu změněno";
         readonly tableDeleted: "Tabulka odstraněna";
         readonly tableInserted: "Tabulka vložena";
         readonly tablePropertiesChanged: "Formátování tabulky změněno";
@@ -3703,6 +3708,7 @@ declare const CATALOGS: {
         readonly rowDeleted: "تم حذف الصف";
         readonly rowInserted: "تم إدراج الصف";
         readonly rowPropertiesChanged: "تم تغيير تنسيق الصف";
+        readonly runPropertiesChanged: "تم تغيير تنسيق النص";
         readonly tableDeleted: "تم حذف الجدول";
         readonly tableInserted: "تم إدراج الجدول";
         readonly tablePropertiesChanged: "تم تغيير تنسيق الجدول";
@@ -4345,6 +4351,7 @@ declare const CATALOGS: {
         readonly rowDeleted: "Rida kustutatud";
         readonly rowInserted: "Rida lisatud";
         readonly rowPropertiesChanged: "Rea vormingut muudeti";
+        readonly runPropertiesChanged: "Teksti vormingut muudeti";
         readonly tableDeleted: "Tabel kustutatud";
         readonly tableInserted: "Tabel lisatud";
         readonly tablePropertiesChanged: "Tabeli vormingut muudeti";
@@ -4987,6 +4994,7 @@ declare const CATALOGS: {
         readonly rowDeleted: "השורה נמחקה";
         readonly rowInserted: "השורה נוספה";
         readonly rowPropertiesChanged: "עיצוב השורה השתנה";
+        readonly runPropertiesChanged: "עיצוב הטקסט השתנה";
         readonly tableDeleted: "הטבלה נמחקה";
         readonly tableInserted: "הטבלה נוספה";
         readonly tablePropertiesChanged: "עיצוב הטבלה השתנה";
@@ -5629,6 +5637,7 @@ declare const CATALOGS: {
         readonly rowDeleted: "पंक्ति हटाई गई";
         readonly rowInserted: "पंक्ति सम्मिलित की गई";
         readonly rowPropertiesChanged: "पंक्ति प्रारूपण बदला गया";
+        readonly runPropertiesChanged: "पाठ स्वरूपण बदला गया";
         readonly tableDeleted: "तालिका हटाई गई";
         readonly tableInserted: "तालिका सम्मिलित की गई";
         readonly tablePropertiesChanged: "तालिका प्रारूपण बदला गया";
@@ -6271,6 +6280,7 @@ declare const CATALOGS: {
         readonly rowDeleted: "Sor törölve";
         readonly rowInserted: "Sor beszúrva";
         readonly rowPropertiesChanged: "Sorformázás megváltozott";
+        readonly runPropertiesChanged: "Szövegformázás megváltozott";
         readonly tableDeleted: "Táblázat törölve";
         readonly tableInserted: "Táblázat beszúrva";
         readonly tablePropertiesChanged: "Táblázatformázás megváltozott";
@@ -6913,6 +6923,7 @@ declare const CATALOGS: {
         readonly rowDeleted: "Eilutė panaikinta";
         readonly rowInserted: "Eilutė įterpta";
         readonly rowPropertiesChanged: "Eilutės formatavimas pakeistas";
+        readonly runPropertiesChanged: "Teksto formatavimas pakeistas";
         readonly tableDeleted: "Lentelė panaikinta";
         readonly tableInserted: "Lentelė įterpta";
         readonly tablePropertiesChanged: "Lentelės formatavimas pakeistas";
@@ -7555,6 +7566,7 @@ declare const CATALOGS: {
         readonly rowDeleted: "Rinda izdzēsta";
         readonly rowInserted: "Rinda ievietota";
         readonly rowPropertiesChanged: "Rindas formatējums mainīts";
+        readonly runPropertiesChanged: "Teksta formatējums mainīts";
         readonly tableDeleted: "Tabula izdzēsta";
         readonly tableInserted: "Tabula ievietota";
         readonly tablePropertiesChanged: "Tabulas formatējums mainīts";
@@ -8197,6 +8209,7 @@ declare const CATALOGS: {
         readonly rowDeleted: "Usunięto wiersz";
         readonly rowInserted: "Wstawiono wiersz";
         readonly rowPropertiesChanged: "Zmieniono formatowanie wiersza";
+        readonly runPropertiesChanged: "Zmieniono formatowanie tekstu";
         readonly tableDeleted: "Usunięto tabelę";
         readonly tableInserted: "Wstawiono tabelę";
         readonly tablePropertiesChanged: "Zmieniono formatowanie tabeli";
@@ -8839,6 +8852,7 @@ declare const CATALOGS: {
         readonly rowDeleted: "Linha excluída";
         readonly rowInserted: "Linha inserida";
         readonly rowPropertiesChanged: "Formatação da linha alterada";
+        readonly runPropertiesChanged: "Formatação do texto alterada";
         readonly tableDeleted: "Tabela excluída";
         readonly tableInserted: "Tabela inserida";
         readonly tablePropertiesChanged: "Formatação da tabela alterada";
@@ -9481,6 +9495,7 @@ declare const CATALOGS: {
         readonly rowDeleted: "Riadok odstránený";
         readonly rowInserted: "Riadok vložený";
         readonly rowPropertiesChanged: "Formátovanie riadka zmenené";
+        readonly runPropertiesChanged: "Formátovanie textu zmenené";
         readonly tableDeleted: "Tabuľka odstránená";
         readonly tableInserted: "Tabuľka vložená";
         readonly tablePropertiesChanged: "Formátovanie tabuľky zmenené";
@@ -10123,6 +10138,7 @@ declare const CATALOGS: {
         readonly rowDeleted: "Satır silindi";
         readonly rowInserted: "Satır eklendi";
         readonly rowPropertiesChanged: "Satır biçimlendirmesi değiştirildi";
+        readonly runPropertiesChanged: "Metin biçimlendirmesi değiştirildi";
         readonly tableDeleted: "Tablo silindi";
         readonly tableInserted: "Tablo eklendi";
         readonly tablePropertiesChanged: "Tablo biçimlendirmesi değiştirildi";
@@ -10765,6 +10781,7 @@ declare const CATALOGS: {
         readonly rowDeleted: "已删除行";
         readonly rowInserted: "已插入行";
         readonly rowPropertiesChanged: "行格式已更改";
+        readonly runPropertiesChanged: "文本格式已更改";
         readonly tableDeleted: "已删除表格";
         readonly tableInserted: "已插入表格";
         readonly tablePropertiesChanged: "表格格式已更改";