@stll/folio-core 0.22.2 → 0.23.0

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

@@ -1,4 +1,4 @@
-import { ImageRun } from "../layout-engine/types.js";
+import { ImageRun, PageMargins } from "../layout-engine/types.js";
 //#region src/layout-painter/anchoredImagePosition.d.ts
 type PageGeometry = {
   pageWidth: number;
@@ -7,6 +7,7 @@ type PageGeometry = {
   marginTop: number;
   marginRight: number;
   marginBottom: number;
+  authoredMargins?: PageMargins;
   contentWidth: number;
   contentHeight: number;
 };

package/dist/layout-painter/anchoredImagePosition.js

@@ -1,6 +1,13 @@
 import { emuToPixels } from "./renderUtils.js";
 //#region src/layout-painter/anchoredImagePosition.ts
+const authoredMargins = (geometry) => geometry.authoredMargins ?? {
+	top: geometry.marginTop,
+	right: geometry.marginRight,
+	bottom: geometry.marginBottom,
+	left: geometry.marginLeft
+};
 function resolveHorizontalBand(relativeTo, geometry) {
+	const margins = authoredMargins(geometry);
 	switch (relativeTo) {
 		case "page": return {
 			baseX: -geometry.marginLeft,
@@ -9,12 +16,12 @@ function resolveHorizontalBand(relativeTo, geometry) {
 		case "leftMargin":
 		case "insideMargin": return {
 			baseX: -geometry.marginLeft,
-			bandWidth: geometry.marginLeft
+			bandWidth: margins.left
 		};
 		case "rightMargin":
 		case "outsideMargin": return {
-			baseX: geometry.contentWidth,
-			bandWidth: geometry.marginRight
+			baseX: geometry.pageWidth - geometry.marginLeft - margins.right,
+			bandWidth: margins.right
 		};
 		case "character": return {
 			baseX: 0,
@@ -27,6 +34,7 @@ function resolveHorizontalBand(relativeTo, geometry) {
 	}
 }
 function resolveVerticalBand(relativeTo, fragmentY, geometry) {
+	const margins = authoredMargins(geometry);
 	switch (relativeTo) {
 		case "page": return {
 			baseY: -geometry.marginTop,
@@ -34,11 +42,11 @@ function resolveVerticalBand(relativeTo, fragmentY, geometry) {
 		};
 		case "topMargin": return {
 			baseY: -geometry.marginTop,
-			bandHeight: geometry.marginTop
+			bandHeight: margins.top
 		};
 		case "bottomMargin": return {
-			baseY: geometry.contentHeight,
-			bandHeight: geometry.marginBottom
+			baseY: geometry.pageHeight - geometry.marginTop - margins.bottom,
+			bandHeight: margins.bottom
 		};
 		case "paragraph":
 		case "line": return {

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

@@ -1,7 +1,7 @@
 import { FlowBlock, Measure } from "../layout-engine/types.js";
+import { ImageAttrs } from "../prosemirror/schema/nodes.js";
 import { BlockLookup } from "./index.js";
 import { WrapType } from "../docx/wrapTypes.js";
-import { ImageAttrs } from "../prosemirror/schema/nodes.js";
 //#region src/layout-painter/imageLayout.d.ts
 /**
  * Anchored wrap-type targets — the OOXML wrap types except `inline`.

package/dist/layout-painter/renderPage.js

@@ -797,6 +797,7 @@ function renderPage(page, context, options = {}) {
 		marginTop: page.margins.top,
 		marginRight: page.margins.right,
 		marginBottom: page.margins.bottom,
+		...page.authoredMargins ? { authoredMargins: page.authoredMargins } : {},
 		contentWidth,
 		contentHeight: page.size.h - page.margins.top - page.margins.bottom
 	};
@@ -1209,10 +1210,19 @@ function computePageFingerprint(page, blockLookup) {
 function computePageRenderFingerprint(page, blockLookup) {
 	return computePageFingerprintInternal(page, blockLookup, { includePmPositions: false });
 }
+const pageMarginsFingerprint = (margins) => [
+	margins.top,
+	margins.right,
+	margins.bottom,
+	margins.left,
+	margins.header ?? "",
+	margins.footer ?? ""
+].join(",");
 function computePageFingerprintInternal(page, blockLookup, options) {
 	const parts = [];
 	parts.push(`s:${page.size.w},${page.size.h}`);
-	parts.push(`m:${page.margins.top},${page.margins.right},${page.margins.bottom},${page.margins.left}`);
+	parts.push(`m:${pageMarginsFingerprint(page.margins)}`);
+	if (page.authoredMargins) parts.push(`am:${pageMarginsFingerprint(page.authoredMargins)}`);
 	parts.push(`n:${page.number}`);
 	if (page.sectionIndex !== void 0) parts.push(`si:${page.sectionIndex}`);
 	if (page.sectionPageNumber !== void 0) parts.push(`sp:${page.sectionPageNumber}`);

package/dist/layout-painter/renderParagraph.js

@@ -2,7 +2,7 @@ import { ommlToMathml } from "../docx/mathToMathml.js";
 import { parseXmlDocument } from "../docx/xmlParser.js";
 import { evaluateFieldInstruction } from "../fields/evaluateField.js";
 import { getListMarkerInlineWidth, getListMarkerVisualOffset } from "../layout-engine/measure/listMarkerWidth.js";
-import "../layout-engine/measure/measureHelpers.js";
+import { DOCX_SCRIPT_FONT_SCALE } from "../layout-engine/measure/measureHelpers.js";
 import { FONT_KERNING_MODE, countCompressibleSpaces, getFontKerningMode, getRunFontKerningMode, toPaintedText } from "../layout-engine/measure/textMeasurementPolicy.js";
 import { isFloatingImageRun } from "../layout-engine/types.js";
 import { calculateTabWidth } from "../prosemirror/utils/tabCalculator.js";
@@ -76,7 +76,6 @@ function isMathRun(run) {
 }
 const AUTOMATIC_TEXT_COLOR_VALUES = /* @__PURE__ */ new Set(["auto", "windowtext"]);
 const DEFAULT_BLACK_TEXT_COLOR_VALUES = /* @__PURE__ */ new Set(["000000", "000"]);
-const DOCX_SUPERSCRIPT_SCALE = .75;
 const SUGGESTION_COLOR_CSS = "var(--suggestion-color, #6d3bd6)";
 const SUGGESTION_TINT_CSS = "var(--suggestion-bg, color-mix(in oklch, #6d3bd6 12%, transparent))";
 const SUGGESTION_TINT_LAYER_CSS = `linear-gradient(${SUGGESTION_TINT_CSS}, ${SUGGESTION_TINT_CSS})`;
@@ -109,8 +108,8 @@ function fontSizePtToPx(fontSizePt) {
 	return fontSizePt * 96 / 72;
 }
 function getRaisedRunFontSize(run) {
-	if (run.fontSize) return `${fontSizePtToPx(run.fontSize) * DOCX_SUPERSCRIPT_SCALE}px`;
-	return `${DOCX_SUPERSCRIPT_SCALE}em`;
+	if (run.fontSize) return `${fontSizePtToPx(run.fontSize) * DOCX_SCRIPT_FONT_SCALE}px`;
+	return `${DOCX_SCRIPT_FONT_SCALE}em`;
 }
 /**
 * Apply text run styles to an element

package/dist/managers/AutoSaveManager.js

@@ -1,10 +1,10 @@
 import { Subscribable } from "./Subscribable.js";
+import { decodeAutoSaveEnvelope, encodeAutoSaveDocument, encodeAutoSaveEnvelopeFromDocument } from "./autoSaveCodec.js";
 //#region src/managers/AutoSaveManager.ts
 const DEFAULT_STORAGE_KEY = "docx-editor-autosave";
 const DEFAULT_INTERVAL = 3e4;
 const DEFAULT_MAX_AGE = 1440 * 60 * 1e3;
 const DEFAULT_DEBOUNCE_DELAY = 2e3;
-const SAVE_VERSION = 1;
 function isLocalStorageAvailable() {
 	try {
 		const testKey = "__docx_editor_test__";
@@ -16,31 +16,7 @@ function isLocalStorageAvailable() {
 	}
 }
 function serializeForStorage(document) {
-	return JSON.stringify({
-		...document,
-		originalBuffer: null
-	});
-}
-function isDocumentLike(value) {
-	return typeof value === "object" && value !== null && "package" in value;
-}
-function parseSavedData(json) {
-	let parsed;
-	try {
-		parsed = JSON.parse(json);
-	} catch {
-		return null;
-	}
-	if (typeof parsed !== "object" || parsed === null) return null;
-	if (!("document" in parsed) || !("savedAt" in parsed) || !("version" in parsed)) return null;
-	const { document, savedAt, version } = parsed;
-	if (typeof savedAt !== "string" || typeof version !== "number") return null;
-	if (!isDocumentLike(document)) return null;
-	return {
-		document,
-		savedAt,
-		version
-	};
+	return encodeAutoSaveDocument(document);
 }
 function isStale(savedAt, maxAge) {
 	const savedTime = new Date(savedAt).getTime();
@@ -99,12 +75,12 @@ var AutoSaveManager = class extends Subscribable {
 		this.updateStatus("saving");
 		try {
 			const serialized = serializeForStorage(doc);
-			if (serialized === this.lastSavedJson) {
+			if (serialized.json === this.lastSavedJson) {
 				this.updateStatus("saved");
 				return true;
 			}
-			this.persistToStorage(doc);
-			this.lastSavedJson = serialized;
+			this.persistToStorage(serialized);
+			this.lastSavedJson = serialized.json;
 			const saveTime = /* @__PURE__ */ new Date();
 			this.lastSaveTime = saveTime;
 			this.updateStatus("saved");
@@ -133,7 +109,7 @@ var AutoSaveManager = class extends Subscribable {
 		if (!this.storageAvailable) return null;
 		const savedJson = localStorage.getItem(this.storageKey);
 		if (!savedJson) return null;
-		const savedData = parseSavedData(savedJson);
+		const savedData = decodeAutoSaveEnvelope(savedJson);
 		if (!savedData) return null;
 		if (isStale(savedData.savedAt, this.maxAge)) {
 			this.clear();
@@ -179,7 +155,7 @@ var AutoSaveManager = class extends Subscribable {
 	destroy() {
 		this.stopTimers();
 		if (this.isEnabled && this.currentDocument && this.storageAvailable) try {
-			this.persistToStorage(this.currentDocument);
+			this.persistToStorage(serializeForStorage(this.currentDocument));
 		} catch (error) {
 			this.onErrorCallback?.(error instanceof Error ? error : new Error(String(error)));
 		}
@@ -194,15 +170,7 @@ var AutoSaveManager = class extends Subscribable {
 		}
 	}
 	persistToStorage(document) {
-		const dataToSave = {
-			document: {
-				...document,
-				originalBuffer: null
-			},
-			savedAt: (/* @__PURE__ */ new Date()).toISOString(),
-			version: SAVE_VERSION
-		};
-		localStorage.setItem(this.storageKey, JSON.stringify(dataToSave));
+		localStorage.setItem(this.storageKey, encodeAutoSaveEnvelopeFromDocument(document, (/* @__PURE__ */ new Date()).toISOString()));
 	}
 	debounceSave() {
 		if (this.debounceTimer) clearTimeout(this.debounceTimer);

package/dist/managers/TableSelectionManager.d.ts

@@ -1,7 +1,7 @@
 import { document_d_exports } from "../types/document.js";
+import { TableAction, TableContext } from "../utils/tableOperations.js";
 import { Subscribable } from "./Subscribable.js";
 import { CellCoordinates } from "./types.js";
-import { TableAction, TableContext } from "../utils/tableOperations.js";
 //#region src/managers/TableSelectionManager.d.ts
 /** Data attributes for table elements in the rendered DOM */
 declare const TABLE_DATA_ATTRIBUTES: {

package/dist/managers/autoSaveCodec.d.ts

@@ -0,0 +1,17 @@
+import { document_d_exports } from "../types/document.js";
+//#region src/managers/autoSaveCodec.d.ts
+declare const AUTOSAVE_FORMAT_VERSION = 2;
+type DecodedAutoSave = {
+  document: document_d_exports.Document;
+  savedAt: string;
+  version: typeof AUTOSAVE_FORMAT_VERSION;
+};
+type EncodedAutoSaveDocument = {
+  json: string;
+};
+declare const encodeAutoSaveDocument: (document: document_d_exports.Document) => EncodedAutoSaveDocument;
+declare const encodeAutoSaveEnvelopeFromDocument: (document: EncodedAutoSaveDocument, savedAt: string) => string;
+declare const encodeAutoSaveEnvelope: (document: document_d_exports.Document, savedAt: string) => string;
+declare const decodeAutoSaveEnvelope: (json: string) => DecodedAutoSave | null;
+//#endregion
+export { AUTOSAVE_FORMAT_VERSION, DecodedAutoSave, EncodedAutoSaveDocument, decodeAutoSaveEnvelope, encodeAutoSaveDocument, encodeAutoSaveEnvelope, encodeAutoSaveEnvelopeFromDocument };

package/dist/managers/autoSaveCodec.js

@@ -0,0 +1,109 @@
+import { validateFolioDocumentModel } from "../docx/modelValidation.js";
+//#region src/managers/autoSaveCodec.ts
+const AUTOSAVE_FORMAT_VERSION = 2;
+const BASE64_CHUNK_BYTES = 32768;
+const encodeBase64 = (buffer) => {
+	const bytes = new Uint8Array(buffer);
+	const chunks = [];
+	for (let offset = 0; offset < bytes.length; offset += BASE64_CHUNK_BYTES) chunks.push(String.fromCharCode(...bytes.subarray(offset, offset + BASE64_CHUNK_BYTES)));
+	return btoa(chunks.join(""));
+};
+const decodeBase64 = (value) => {
+	const binary = atob(value);
+	const bytes = new Uint8Array(binary.length);
+	for (let index = 0; index < binary.length; index += 1) bytes[index] = binary.charCodeAt(index);
+	return bytes.buffer;
+};
+const encodeValue = (value) => {
+	if (value === void 0) return { type: "undefined" };
+	if (value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean") return value;
+	if (value instanceof Date) return {
+		type: "date",
+		value: value.toISOString()
+	};
+	if (value instanceof ArrayBuffer) return {
+		type: "arrayBuffer",
+		value: encodeBase64(value)
+	};
+	if (value instanceof Map) return {
+		type: "map",
+		value: [...value.entries()].map(([key, entry]) => [encodeValue(key), encodeValue(entry)])
+	};
+	if (Array.isArray(value)) return {
+		type: "array",
+		value: value.map(encodeValue)
+	};
+	if (typeof value === "object") {
+		const encoded = {};
+		for (const [key, entry] of Object.entries(value)) encoded[key] = encodeValue(entry);
+		return {
+			type: "object",
+			value: encoded
+		};
+	}
+	throw new TypeError(`Unsupported auto-save value: ${typeof value}`);
+};
+const decodeValue = (value) => {
+	if (value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean") return value;
+	if (typeof value !== "object" || !value || !("type" in value)) throw new TypeError("Invalid auto-save encoded value");
+	const type = value.type;
+	if (type === "undefined") return;
+	if (type === "date") {
+		if (!("value" in value) || typeof value.value !== "string" || !Number.isFinite(Date.parse(value.value))) throw new TypeError("Invalid auto-save date");
+		return new Date(value.value);
+	}
+	if (type === "arrayBuffer") {
+		if (!("value" in value) || typeof value.value !== "string") throw new TypeError("Invalid auto-save binary data");
+		return decodeBase64(value.value);
+	}
+	if (type === "array") {
+		if (!("value" in value) || !Array.isArray(value.value)) throw new TypeError("Invalid auto-save array");
+		return value.value.map(decodeValue);
+	}
+	if (type === "map") {
+		if (!("value" in value) || !Array.isArray(value.value)) throw new TypeError("Invalid auto-save map");
+		return new Map(value.value.map((entry) => {
+			if (!Array.isArray(entry) || entry.length !== 2) throw new TypeError("Invalid auto-save map entry");
+			return [decodeValue(entry[0]), decodeValue(entry[1])];
+		}));
+	}
+	if (type === "object") {
+		if (!("value" in value) || typeof value.value !== "object" || !value.value) throw new TypeError("Invalid auto-save object");
+		const decoded = Object.create(null);
+		for (const [key, entry] of Object.entries(value.value)) {
+			if (key === "__proto__" || key === "constructor" || key === "prototype") throw new TypeError("Invalid auto-save object key");
+			const decodedEntry = decodeValue(entry);
+			if (decodedEntry !== void 0) decoded[key] = decodedEntry;
+		}
+		return decoded;
+	}
+	throw new TypeError("Unknown auto-save encoded value");
+};
+const encodeAutoSaveDocument = (document) => {
+	const snapshot = {
+		...document,
+		originalBuffer: null
+	};
+	return { json: JSON.stringify(encodeValue(snapshot)) };
+};
+const encodeAutoSaveEnvelopeFromDocument = (document, savedAt) => `{"document":${document.json},"savedAt":${JSON.stringify(savedAt)},"version":2}`;
+const encodeAutoSaveEnvelope = (document, savedAt) => encodeAutoSaveEnvelopeFromDocument(encodeAutoSaveDocument(document), savedAt);
+const decodeAutoSaveEnvelope = (json) => {
+	try {
+		const parsed = JSON.parse(json);
+		if (typeof parsed !== "object" || !parsed || !("document" in parsed) || !("savedAt" in parsed) || !("version" in parsed)) return null;
+		if (parsed.version !== 2 || typeof parsed.savedAt !== "string" || !Number.isFinite(Date.parse(parsed.savedAt))) return null;
+		const document = decodeValue(parsed.document);
+		if (typeof document !== "object" || !document) return null;
+		if (!validateFolioDocumentModel(document).valid) return null;
+		return {
+			document,
+			savedAt: parsed.savedAt,
+			version: 2
+		};
+	} catch {
+		return null;
+	}
+};
+//#endregion
+export { AUTOSAVE_FORMAT_VERSION, decodeAutoSaveEnvelope, encodeAutoSaveDocument, encodeAutoSaveEnvelope, encodeAutoSaveEnvelopeFromDocument };