@stll/folio-core 0.58.0 → 0.58.1

package/dist/ai-edits/headless.js

@@ -22,7 +22,7 @@ import { expectCharacterStyleMarkAttrs, expectFootnoteRefMarkAttrs } from "../pr
 import { acceptAIEditRevision, acceptSuggestion, getSuggestions, rejectAIEditRevision, rejectAllSuggestions, rejectSuggestion, resolveAllChangesInHeadlessState, suggestionIdOfRevision } from "../prosemirror/commands/comments.js";
 import { sectionRejectProperties } from "../prosemirror/commands/propertyChangeScope.js";
 import { allocateCommentId, createCommentIdAllocator, seedCommentAllocator } from "../prosemirror/commentIdAllocator.js";
-import { proseDocToBlocks, updateDocumentContent } from "../prosemirror/conversion/fromProseDoc.js";
+import { fromProseDoc, proseDocToBlocks } from "../prosemirror/conversion/fromProseDoc.js";
 import { footnoteToProseDoc, headerFooterToProseDoc, toProseDoc } from "../prosemirror/conversion/toProseDoc.js";
 import { ensureBaseDirectionInState } from "../prosemirror/extensions/features/AutoBidiDetectionExtension.js";
 import { getChangedParagraphIds, getTrackedSectionEndpointRemoval, hasStructuralChanges, hasUntrackedChanges } from "../prosemirror/extensions/features/ParagraphChangeTrackerExtension.js";
@@ -1680,13 +1680,17 @@ var FolioDocxReviewer = class FolioDocxReviewer {
 		};
 	}
 	documentFromStateSnapshot(snapshot) {
-		const document = updateDocumentContent(snapshot.importedStyles === void 0 ? this.baseDocument : {
+		const sourceDocument = snapshot.importedStyles === void 0 ? this.baseDocument : {
 			...this.baseDocument,
 			package: {
 				...this.baseDocument.package,
 				styles: snapshot.importedStyles
 			}
-		}, snapshot.mainState.doc);
+		};
+		const document = fromProseDoc(snapshot.mainState.doc, sourceDocument, { stylesheetSource: snapshot.importedStyles === void 0 ? { type: "package" } : {
+			type: "supplied",
+			styles: snapshot.importedStyles
+		} });
 		if (snapshot.finalSectionPropertiesOverride !== void 0) document.package.document.finalSectionProperties = snapshot.finalSectionPropertiesOverride;
 		if (snapshot.importedStyles !== void 0) document.package.styles = snapshot.importedStyles;
 		if (snapshot.importedMedia.size > 0) document.package.media = new Map([...document.package.media ?? [], ...snapshot.importedMedia]);

package/dist/docx/headerFooterVerbatim.d.ts

@@ -25,8 +25,20 @@ declare const canReplayHeaderFooterVerbatim: (hf: document_d_exports.HeaderFoote
 declare const assignHeaderFooterVerbatimXml: (hf: document_d_exports.HeaderFooter, xml: string) => void;
 declare const refreshHeaderFooterVerbatimFingerprint: (hf: document_d_exports.HeaderFooter) => void;
 declare const clearHeaderFooterVerbatimXml: (hf: document_d_exports.HeaderFooter) => void;
-/** Capture the body in the same trusted package registry as secondary stories. */
-declare const captureDocumentSourceBaseline: (document: document_d_exports.Document, xml: string) => void;
+/** Capture parsed resources on the same trusted handle, including an absent main part. */
+declare const captureDocumentSourceBaseline: (document: document_d_exports.Document, xml: string | undefined) => void;
+/** Read the identity-stable, deeply frozen stylesheet without cloning or body comparison. */
+declare const getDocumentSourceStyles: (document: document_d_exports.Document, liveStyles?: document_d_exports.Document["package"]["styles"]) => {
+  readonly type: "missing";
+  readonly baseline?: never;
+} | {
+  readonly type: "mismatch";
+  readonly baseline?: never;
+} | {
+  readonly type: "captured";
+  readonly styles: Readonly<import("@stll/docx-core/model").StyleDefinitions> | undefined;
+  readonly additions: import("@stll/docx-core").Style[];
+};
 declare const getDocumentSourceBaseline: (document: document_d_exports.Document) => {
   type: "missing";
 } | {
@@ -44,4 +56,4 @@ declare const getDocumentSourceBaseline: (document: document_d_exports.Document)
   }>;
 };
 //#endregion
-export { assignHeaderFooterVerbatimXml, canReplayHeaderFooterBlocks, canReplayHeaderFooterVerbatim, captureDocumentSourceBaseline, captureHeaderFooterPackageBaselines, clearHeaderFooterVerbatimXml, copyHeaderFooterBaselineHandles, copyHeaderFooterPackageBaselines, getDocumentSourceBaseline, getHeaderFooterSourceBaseline, getHeaderFooterVerbatimXml, refreshHeaderFooterVerbatimFingerprint };
+export { assignHeaderFooterVerbatimXml, canReplayHeaderFooterBlocks, canReplayHeaderFooterVerbatim, captureDocumentSourceBaseline, captureHeaderFooterPackageBaselines, clearHeaderFooterVerbatimXml, copyHeaderFooterBaselineHandles, copyHeaderFooterPackageBaselines, getDocumentSourceBaseline, getDocumentSourceStyles, getHeaderFooterSourceBaseline, getHeaderFooterVerbatimXml, refreshHeaderFooterVerbatimFingerprint };

package/dist/docx/headerFooterVerbatim.js

@@ -1,5 +1,5 @@
 import { canonicalJson } from "../utils/canonicalJson.js";
-import { Result } from "better-result";
+import { Result, panic } from "better-result";
 //#region src/docx/headerFooterVerbatim.ts
 const fingerprintBaselines = /* @__PURE__ */ new WeakMap();
 const readFingerprint = (hf) => {
@@ -147,16 +147,33 @@ const clearHeaderFooterVerbatimXml = (hf) => {
 	delete ext.verbatimFingerprint;
 	Reflect.deleteProperty(hf, BASELINE_HANDLE);
 };
-/** Capture the body in the same trusted package registry as secondary stories. */
+/** Freeze the parsed plain-object graph once, retaining shared references. */
+const freezeSourceStyles = (value, visited = /* @__PURE__ */ new WeakSet()) => {
+	if (typeof value !== "object" || value === null || visited.has(value)) return;
+	visited.add(value);
+	for (const child of Object.values(value)) freezeSourceStyles(child, visited);
+	Object.freeze(value);
+};
+/** Capture parsed resources on the same trusted handle, including an absent main part. */
 const captureDocumentSourceBaseline = (document, xml) => {
-	const body = structuredClone(document.package.document);
 	const handle = {};
-	contentBaselines.set(handle, {
+	const resourceStyles = structuredClone(document.package.styles);
+	freezeSourceStyles(resourceStyles);
+	const styleIds = new Set(resourceStyles?.styles.map(({ styleId }) => styleId));
+	if (xml === void 0) contentBaselines.set(handle, {
+		type: "body",
+		kind: "noMainPart",
+		resourceStyles,
+		styleIds
+	});
+	else contentBaselines.set(handle, {
 		type: "body",
+		kind: "mainPart",
 		fingerprint: { type: "pending" },
 		xml,
-		body,
-		resourceStyles: structuredClone(document.package.styles),
+		body: structuredClone(document.package.document),
+		resourceStyles,
+		styleIds,
 		resourceRelationships: structuredClone(document.package.relationships),
 		resourceMedia: new Map([...document.package.media ?? []].map(([path, media]) => [path, {
 			data: media.data,
@@ -174,13 +191,38 @@ const captureDocumentSourceBaseline = (document, xml) => {
 		packageBaselines.set(document.originalBuffer, registry);
 	}
 };
-const getDocumentSourceBaseline = (document) => {
+const readDocumentSourceCapture = (document) => {
 	const body = document.package.document;
 	const handle = BASELINE_HANDLE in body ? body[BASELINE_HANDLE] : document.originalBuffer && packageBaselines.get(document.originalBuffer)?.get("word/document.xml")?.get("body");
 	if (handle === void 0) return { type: "missing" };
 	if (typeof handle !== "object" || handle === null) return { type: "mismatch" };
 	const baseline = contentBaselines.get(handle);
 	if (!baseline || baseline.type !== "body") return { type: "mismatch" };
+	return {
+		type: "captured",
+		baseline
+	};
+};
+/** Read the identity-stable, deeply frozen stylesheet without cloning or body comparison. */
+const getDocumentSourceStyles = (document, liveStyles) => {
+	const source = readDocumentSourceCapture(document);
+	if (source.type !== "captured") return source;
+	const additions = liveStyles?.styles.filter(({ styleId }) => !source.baseline.styleIds.has(styleId)) ?? [];
+	return {
+		type: "captured",
+		styles: source.baseline.resourceStyles,
+		additions
+	};
+};
+const getDocumentSourceBaseline = (document) => {
+	const source = readDocumentSourceCapture(document);
+	if (source.type !== "captured") return source;
+	const { baseline } = source;
+	switch (baseline.kind) {
+		case "noMainPart": return { type: "missing" };
+		case "mainPart": break;
+		default: return panic(`Unexpected document source capture: ${JSON.stringify(baseline)}`);
+	}
 	const fingerprint = JSON.stringify(baseline.body);
 	if (baseline.fingerprint.type === "pending") baseline.fingerprint = {
 		type: "captured",
@@ -198,4 +240,4 @@ const getDocumentSourceBaseline = (document) => {
 	};
 };
 //#endregion
-export { assignHeaderFooterVerbatimXml, canReplayHeaderFooterBlocks, canReplayHeaderFooterVerbatim, captureDocumentSourceBaseline, captureHeaderFooterPackageBaselines, clearHeaderFooterVerbatimXml, copyHeaderFooterBaselineHandles, copyHeaderFooterPackageBaselines, getDocumentSourceBaseline, getHeaderFooterSourceBaseline, getHeaderFooterVerbatimXml, refreshHeaderFooterVerbatimFingerprint };
+export { assignHeaderFooterVerbatimXml, canReplayHeaderFooterBlocks, canReplayHeaderFooterVerbatim, captureDocumentSourceBaseline, captureHeaderFooterPackageBaselines, clearHeaderFooterVerbatimXml, copyHeaderFooterBaselineHandles, copyHeaderFooterPackageBaselines, getDocumentSourceBaseline, getDocumentSourceStyles, getHeaderFooterSourceBaseline, getHeaderFooterVerbatimXml, refreshHeaderFooterVerbatimFingerprint };

package/dist/docx/parser.js

@@ -474,7 +474,7 @@ async function parseDocxWithPreviewBudget(input, options, previewBudget) {
 		}
 		onProgress("Complete", 100);
 		captureHeaderFooterPackageBaselines(document);
-		if (raw.documentXml) captureDocumentSourceBaseline(document, raw.documentXml);
+		captureDocumentSourceBaseline(document, raw.documentXml ?? void 0);
 		return document;
 	} catch (error) {
 		if (error instanceof DocxEncryptionError) throw error;

package/dist/prosemirror/conversion/fromProseDoc.d.ts

@@ -16,7 +16,15 @@ import { Node } from "prosemirror-model";
 type ProjectionReuse = "none" | "matched";
 /** How the conversion treats records the editor did not change. */
 type FromProseDocOptions = {
-  /** The stylesheet authority used to construct the projection. */
+  /**
+   * The stylesheet authority used to construct the projection. With a parsed package,
+   * package source uses its captured definitions; edits to live package.styles do not
+   * alter existing definitions. Captured definitions are deeply frozen and shared;
+   * package-source saves append live definitions for IDs missing from the capture.
+   * Supplied sources follow the same addition rule and must match existing definitions
+   * and document defaults. Clone frozen definitions once when authoring a mutable copy.
+   * If the parsed package had no styles part, all live definitions are additions.
+   */
   stylesheetSource: {
     type: "package";
   } | {

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -1,7 +1,7 @@
 import { joinCommentRangesAcrossParagraphs } from "../../docx/commentRangeJoin.js";
 import { completeCommentReferences } from "../../docx/commentReferenceCompletion.js";
 import { normalizeFoldedListNumbers } from "../../docx/foldedListNumberFields.js";
-import { getDocumentSourceBaseline } from "../../docx/headerFooterVerbatim.js";
+import { getDocumentSourceStyles } from "../../docx/headerFooterVerbatim.js";
 import { EDITED_PREVIEW_FINGERPRINT, imageRawXmlFingerprint } from "../../docx/imageRawXml.js";
 import { isInlineSdtContent, isSimpleFieldContent } from "../../docx/inlineWrapperContent.js";
 import { paragraphNumberingReferenceId as paragraphNumberingReferenceId$1, sameStatedParagraphNumbering as sameStatedParagraphNumbering$1 } from "../../docx/numberingReference.js";
@@ -272,56 +272,77 @@ const restoreLinkedParagraphPropertySources = (content) => {
 	};
 };
 var SaveStylesheetSourceMismatch = class extends TaggedError("SaveStylesheetSourceMismatch") {};
-const assertSuppliedStylesMatchSource = (styles, baseDocument) => {
-	if (!baseDocument?.originalBuffer) return;
-	const source = getDocumentSourceBaseline(baseDocument);
+const parsedPackageStyles = (document, liveStyles) => {
+	const source = getDocumentSourceStyles(document, liveStyles);
 	switch (source.type) {
+		case "captured": {
+			if (source.styles !== void 0 && source.additions.length === 0) return source.styles;
+			const addedIds = /* @__PURE__ */ new Set();
+			for (const addition of source.additions) {
+				if (addedIds.has(addition.styleId)) throw new SaveStylesheetSourceMismatch({
+					message: `Duplicate added style ID: ${addition.styleId}.`,
+					divergences: [{
+						type: "style",
+						styleId: addition.styleId
+					}]
+				});
+				addedIds.add(addition.styleId);
+			}
+			if (source.styles === void 0) return liveStyles === void 0 ? void 0 : structuredClone(liveStyles);
+			return {
+				...source.styles,
+				styles: [...source.styles.styles, ...structuredClone(source.additions)]
+			};
+		}
 		case "missing":
 		case "mismatch": throw new SaveStylesheetSourceMismatch({
 			message: "The parsed package stylesheet source is unavailable.",
 			divergences: [{ type: "sourceUnavailable" }]
 		});
-		case "captured": {
-			const sourceStyles = source.resourceStyles;
-			if (!sourceStyles) return;
-			const suppliedById = new Map(styles.styles.map((style) => [style.styleId, style]));
-			const sourceById = new Map(sourceStyles.styles.map((style) => [style.styleId, style]));
-			const divergentIds = /* @__PURE__ */ new Set();
-			for (const style of sourceStyles.styles) if (canonicalJson(style) !== canonicalJson(suppliedById.get(style.styleId))) divergentIds.add(style.styleId);
-			for (const style of styles.styles) if (canonicalJson(style) !== canonicalJson(suppliedById.get(style.styleId))) divergentIds.add(style.styleId);
-			const persistedStyles = {
-				...sourceStyles,
-				styles: [...sourceStyles.styles, ...styles.styles.filter(({ styleId }) => !sourceById.has(styleId))]
-			};
-			const suppliedResolver = createStyleEngine(styles);
-			const persistedResolver = createStyleEngine(persistedStyles);
-			for (const [supplied, persisted] of [
-				[suppliedResolver.getDefaultParagraphStyle(), persistedResolver.getDefaultParagraphStyle()],
-				[suppliedResolver.getDefaultCharacterStyle(), persistedResolver.getDefaultCharacterStyle()],
-				[suppliedResolver.getDefaultTableStyle(), persistedResolver.getDefaultTableStyle()]
-			]) {
-				if (supplied?.styleId === persisted?.styleId) continue;
-				if (supplied) divergentIds.add(supplied.styleId);
-				if (persisted) divergentIds.add(persisted.styleId);
-			}
-			const divergences = [];
-			for (const styleId of divergentIds) divergences.push({
-				type: "style",
-				styleId
-			});
-			if (canonicalJson(styles.docDefaults) !== canonicalJson(sourceStyles.docDefaults)) divergences.push({ type: "docDefaults" });
-			if (divergences.length === 0) return;
-			throw new SaveStylesheetSourceMismatch({
-				message: `Supplied stylesheet differs from the parsed package: ${[...divergentIds, ...divergences.some(({ type }) => type === "docDefaults") ? ["docDefaults"] : []].join(", ")}.`,
-				divergences
-			});
-		}
-		default: return panic(`Unexpected stylesheet source baseline: ${JSON.stringify(source)}`);
+		default: return panic(`Unexpected stylesheet source capture: ${JSON.stringify(source)}`);
 	}
 };
+const assertSuppliedStylesMatchSource = (styles, baseDocument) => {
+	if (!baseDocument?.originalBuffer) return;
+	const sourceStyles = parsedPackageStyles(baseDocument);
+	if (!sourceStyles) return;
+	const suppliedById = new Map(styles.styles.map((style) => [style.styleId, style]));
+	const sourceById = new Map(sourceStyles.styles.map((style) => [style.styleId, style]));
+	const divergentIds = /* @__PURE__ */ new Set();
+	for (const style of sourceStyles.styles) if (canonicalJson(style) !== canonicalJson(suppliedById.get(style.styleId))) divergentIds.add(style.styleId);
+	for (const style of styles.styles) if (canonicalJson(style) !== canonicalJson(suppliedById.get(style.styleId))) divergentIds.add(style.styleId);
+	const persistedStyles = {
+		...sourceStyles,
+		styles: [...sourceStyles.styles, ...styles.styles.filter(({ styleId }) => !sourceById.has(styleId))]
+	};
+	const suppliedResolver = createStyleEngine(styles);
+	const persistedResolver = createStyleEngine(persistedStyles);
+	for (const [supplied, persisted] of [
+		[suppliedResolver.getDefaultParagraphStyle(), persistedResolver.getDefaultParagraphStyle()],
+		[suppliedResolver.getDefaultCharacterStyle(), persistedResolver.getDefaultCharacterStyle()],
+		[suppliedResolver.getDefaultTableStyle(), persistedResolver.getDefaultTableStyle()]
+	]) {
+		if (supplied?.styleId === persisted?.styleId) continue;
+		if (supplied) divergentIds.add(supplied.styleId);
+		if (persisted) divergentIds.add(persisted.styleId);
+	}
+	const divergences = [];
+	for (const styleId of divergentIds) divergences.push({
+		type: "style",
+		styleId
+	});
+	if (canonicalJson(styles.docDefaults) !== canonicalJson(sourceStyles.docDefaults)) divergences.push({ type: "docDefaults" });
+	if (divergences.length === 0) return;
+	throw new SaveStylesheetSourceMismatch({
+		message: `Supplied stylesheet differs from the parsed package: ${[...divergentIds, ...divergences.some(({ type }) => type === "docDefaults") ? ["docDefaults"] : []].join(", ")}.`,
+		divergences
+	});
+};
 const saveStylesheet = (source, baseDocument) => {
 	switch (source.type) {
-		case "package": return baseDocument?.package.styles;
+		case "package":
+			if (!baseDocument?.originalBuffer) return baseDocument?.package.styles;
+			return parsedPackageStyles(baseDocument, baseDocument.package.styles);
 		case "supplied":
 			assertSuppliedStylesMatchSource(source.styles, baseDocument);
 			return source.styles;
@@ -347,13 +368,6 @@ const assertSaveStylesheetAvailable = ({ pmDoc, styles, baseDocument, stylesheet
 };
 /** Convert a ProseMirror document to the document model. */
 function fromProseDoc(pmDoc, baseDocument, { stylesheetSource, reuse = "none" }) {
-	const styles = saveStylesheet(stylesheetSource, baseDocument);
-	assertSaveStylesheetAvailable({
-		pmDoc,
-		styles,
-		baseDocument,
-		stylesheetSource
-	});
 	assertNoteReferenceOccurrences(pmDoc);
 	switch (reuse) {
 		case "none": break;
@@ -366,6 +380,13 @@ function fromProseDoc(pmDoc, baseDocument, { stylesheetSource, reuse = "none" })
 	const proseContract = getProseDocumentParagraphPropertySourceContract(pmDoc);
 	if (proseContractAttribute !== null && proseContractAttribute !== void 0 && proseContract === null || (baseContract ?? null) !== proseContract) throw sourceValidationError("contract_mismatch", "The ProseMirror document does not match its paragraph-property source document.");
 	const tokenSources = baseContract && proseContract && baseDocument ? validateParagraphPropertySourceTokens(pmDoc, baseDocument, baseContract) : null;
+	const styles = saveStylesheet(stylesheetSource, baseDocument);
+	assertSaveStylesheetAvailable({
+		pmDoc,
+		styles,
+		baseDocument,
+		stylesheetSource
+	});
 	const blocks = extractBlocks(pmDoc, "resolve", createStyleEngine(styles));
 	joinCommentRangesAcrossParagraphs(blocks);
 	completeCommentReferences(blocks);
@@ -384,7 +405,7 @@ function fromProseDoc(pmDoc, baseDocument, { stylesheetSource, reuse = "none" })
 			package: {
 				...baseDocument.package,
 				document: documentBody,
-				...styles ? { styles } : {},
+				styles,
 				...numbering ? { numbering } : {}
 			}
 		};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.58.0",
+  "version": "0.58.1",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",
@@ -146,7 +146,7 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.34.0",
+    "@stll/docx-core": "^0.35.0",
     "@stll/docx-utils": "^0.1.0",
     "@stll/template-conditions": "^0.6.2",
     "better-result": "3.0.1",