@stll/folio-core 0.18.0 → 0.19.0

package/dist/controller/fontReadiness.js

@@ -1,4 +1,5 @@
 import { expectFontFamilyMarkAttrs } from "../prosemirror/attrs/index.js";
+import { parseFontFamilyList, resolveFontFamily } from "../utils/fontResolver.js";
 //#region src/controller/fontReadiness.ts
 function getDocumentFontSet() {
 	if (typeof document === "undefined" || !("fonts" in document)) return null;
@@ -10,15 +11,6 @@ function documentFontsAreLoaded() {
 }
 const INITIAL_LAYOUT_FONT_TIMEOUT_MS = 2e3;
 const DEFAULT_LAYOUT_FONT_FAMILY = "Calibri";
-const OFFICE_FONT_FAMILY_MAP = {
-	Aptos: "Lato",
-	"Aptos Display": "Lato",
-	Arial: "Arimo",
-	Calibri: "Carlito",
-	Cambria: "Caladea",
-	"Times New Roman": "Tinos",
-	"Courier New": "Cousine"
-};
 const CSS_GENERIC_FONT_FAMILIES = /* @__PURE__ */ new Set([
 	"serif",
 	"sans-serif",
@@ -127,8 +119,17 @@ function addLayoutFontFamilyNameFace(faces, family, descriptor) {
 	const normalized = family.trim();
 	if (!normalized || CSS_GENERIC_FONT_FAMILIES.has(normalized)) return;
 	addLayoutFontFace(faces, normalized, descriptor);
-	const mappedFamily = OFFICE_FONT_FAMILY_MAP[normalized];
-	if (mappedFamily) addLayoutFontFace(faces, mappedFamily, descriptor);
+	for (const stackFamily of resolvedStackFamilies(normalized)) addLayoutFontFace(faces, stackFamily, descriptor);
+}
+/**
+* The concrete families in a resolved CSS font stack, generics dropped.
+*
+* Parsed from the stack rather than read from a map because the stack is what
+* the painter and the measurer put in `ctx.font` and `style.fontFamily`.
+*/
+function resolvedStackFamilies(family) {
+	const { cssFallback } = resolveFontFamily(family);
+	return parseFontFamilyList(cssFallback).filter((name) => !CSS_GENERIC_FONT_FAMILIES.has(name));
 }
 function addLayoutFontFace(faces, family, descriptor) {
 	faces.set(`${family}|${descriptor.style}|${descriptor.weight}`, {

package/dist/managers/DocumentLoaderManager.d.ts

@@ -23,6 +23,13 @@ type DocumentLoaderHistory = {
 type DocumentLoaderCallbacks = {
   /** Editor history to reset/seed with the loaded document. */
   history: DocumentLoaderHistory;
+  /**
+   * Receives the identity of the document that just landed in history. Every
+   * load allocates a fresh identity, so the adapter can tell an external load
+   * (a new file, or the same file re-parsed) from the loaded document being
+   * round-tripped back through its own state after an internal edit.
+   */
+  setLoadedDocumentIdentity: (identity: string) => void;
   /** Called when an unrecoverable parse error occurs. */
   onError: ((error: Error) => void) | undefined;
   /** Called after parsing to report whether editing can preserve fidelity. */
@@ -40,8 +47,13 @@ declare class DocumentLoaderManager {
   setCallbacks(callbacks: DocumentLoaderCallbacks): void;
   /** Reset color/UI state coupled to the previous document. */
   resetForNewDocument(): void;
-  /** Load an already-parsed document. */
+  /**
+   * Load an already-parsed document. Allocates a load generation like
+   * `loadBuffer`, so a buffer parse still in flight when this lands is
+   * discarded instead of overwriting the newer document.
+   */
   loadParsedDocument(doc: document_d_exports.Document): void;
+  private commitParsedDocument;
   /**
    * Parse and load a raw DOCX buffer. A monotonic generation counter discards
    * the result (and any error) when a newer load started while this one was in

package/dist/managers/DocumentLoaderManager.js

@@ -30,11 +30,19 @@ var DocumentLoaderManager = class {
 		resetAuthorColors();
 		this.callbacks.onReset();
 	}
-	/** Load an already-parsed document. */
+	/**
+	* Load an already-parsed document. Allocates a load generation like
+	* `loadBuffer`, so a buffer parse still in flight when this lands is
+	* discarded instead of overwriting the newer document.
+	*/
 	loadParsedDocument(doc) {
-		const { history, onCompatibilityChange, setDocumentLoadState } = this.callbacks;
+		this.commitParsedDocument(doc, ++this.loadGeneration);
+	}
+	commitParsedDocument(doc, generation) {
+		const { history, onCompatibilityChange, setDocumentLoadState, setLoadedDocumentIdentity } = this.callbacks;
 		this.resetForNewDocument();
 		history.reset(doc);
+		setLoadedDocumentIdentity(String(generation));
 		onCompatibilityChange?.(inspectDocxCompatibility(doc));
 		setDocumentLoadState({ status: "ready" });
 		if (doc.requiredFonts && doc.requiredFonts.length > 0) loadFontsWithMapping(doc.requiredFonts).catch(() => void 0);
@@ -61,7 +69,7 @@ var DocumentLoaderManager = class {
 				recordDocumentLoadPhase("docx-parse", performance.now() - parseStartedAt);
 			}
 			if (this.loadGeneration !== generation) return;
-			this.loadParsedDocument(doc);
+			this.commitParsedDocument(doc, generation);
 		} catch (error) {
 			if (this.loadGeneration !== generation) return;
 			const message = error instanceof Error ? error.message : "Failed to parse document";

package/dist/utils/fontResolver.d.ts

@@ -48,6 +48,13 @@ declare const setGoogleFontsEnabled: (enabled: boolean) => void;
 declare const getGoogleFontsEnabled: () => boolean;
 declare const setEmbeddedFontFamilyMap: (map: ReadonlyMap<string, string> | null) => void;
 declare function resolveFontFamily(docxFontName: string): ResolvedFont;
+/**
+ * Split a CSS `font-family` list built by `quoteFontName` back into family
+ * names: the inverse of the quoting and escaping applied there. Quoted entries
+ * may contain commas, quotes (backslash-escaped), and the newline escapes
+ * `escapeQuotedFontName` emits; unquoted entries end at the next comma.
+ */
+declare function parseFontFamilyList(list: string): string[];
 /**
  * Resolve a theme font reference to actual font names
  *
@@ -86,4 +93,4 @@ declare function getGoogleFontEquivalent(docxFontName: string): string | null;
  */
 declare function hasGoogleFontEquivalent(docxFontName: string): boolean;
 //#endregion
-export { CJK_FALLBACK_FONT_FAMILY, DEFAULT_SINGLE_LINE_RATIO, ResolvedFont, buildFontFamilyString, getGoogleFontEquivalent, getGoogleFontsEnabled, getGoogleFontsToLoad, hasGoogleFontEquivalent, isCjkFont, resolveFontFamily, resolveThemeFont, setEmbeddedFontFamilyMap, setGoogleFontsEnabled };
+export { CJK_FALLBACK_FONT_FAMILY, DEFAULT_SINGLE_LINE_RATIO, ResolvedFont, buildFontFamilyString, getGoogleFontEquivalent, getGoogleFontsEnabled, getGoogleFontsToLoad, hasGoogleFontEquivalent, isCjkFont, parseFontFamilyList, resolveFontFamily, resolveThemeFont, setEmbeddedFontFamilyMap, setGoogleFontsEnabled };

package/dist/utils/fontResolver.js

@@ -865,6 +865,62 @@ function quoteFontName(fontName) {
 	if (/[\s,'"()]/.test(fontName)) return `"${escapeQuotedFontName(fontName)}"`;
 	return fontName;
 }
+const CSS_NEWLINE_UNESCAPES = {
+	a: "\n",
+	d: "\r",
+	c: "\f"
+};
+/**
+* Split a CSS `font-family` list built by `quoteFontName` back into family
+* names: the inverse of the quoting and escaping applied there. Quoted entries
+* may contain commas, quotes (backslash-escaped), and the newline escapes
+* `escapeQuotedFontName` emits; unquoted entries end at the next comma.
+*/
+function parseFontFamilyList(list) {
+	const families = [];
+	let current = "";
+	let quote = null;
+	let quoted = false;
+	const push = () => {
+		const name = quoted ? current : current.trim();
+		if (name) families.push(name);
+		current = "";
+		quoted = false;
+	};
+	for (let index = 0; index < list.length; index += 1) {
+		const char = list[index];
+		if (quote === null) {
+			if (char === ",") push();
+			else if (quoted) continue;
+			else if ((char === "\"" || char === "'") && current.trim() === "") {
+				quote = char;
+				current = "";
+			} else current += char;
+			continue;
+		}
+		if (char === quote) {
+			quote = null;
+			quoted = true;
+			continue;
+		}
+		if (char !== "\\") {
+			current += char;
+			continue;
+		}
+		const escaped = list[index + 1];
+		if (escaped === void 0) continue;
+		index += 1;
+		const newline = CSS_NEWLINE_UNESCAPES[escaped];
+		if (newline === void 0) {
+			current += escaped;
+			continue;
+		}
+		current += newline;
+		if (list[index + 1] === " ") index += 1;
+	}
+	push();
+	return families;
+}
 /**
 * Resolve a theme font reference to actual font names
 *
@@ -928,4 +984,4 @@ function hasGoogleFontEquivalent(docxFontName) {
 	return (CJK_FONT_ALIASES[normalizedName] ?? normalizedName) in FONT_MAPPINGS;
 }
 //#endregion
-export { CJK_FALLBACK_FONT_FAMILY, DEFAULT_SINGLE_LINE_RATIO, buildFontFamilyString, getGoogleFontEquivalent, getGoogleFontsEnabled, getGoogleFontsToLoad, hasGoogleFontEquivalent, isCjkFont, resolveFontFamily, resolveThemeFont, setEmbeddedFontFamilyMap, setGoogleFontsEnabled };
+export { CJK_FALLBACK_FONT_FAMILY, DEFAULT_SINGLE_LINE_RATIO, buildFontFamilyString, getGoogleFontEquivalent, getGoogleFontsEnabled, getGoogleFontsToLoad, hasGoogleFontEquivalent, isCjkFont, parseFontFamilyList, resolveFontFamily, resolveThemeFont, setEmbeddedFontFamilyMap, setGoogleFontsEnabled };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.18.0",
+  "version": "0.19.0",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",