@stll/folio-core 0.22.1 → 0.22.3

package/dist/prosemirror/extensions/marks/markUtils.js

@@ -1,5 +1,20 @@
+import { FONT_THEME_VALUES } from "../../../types/documentEnumValues.js";
+import { mergeFontFamily } from "../../../utils/fontFamilyMerge.js";
+import { expectFontFamilyMarkAttrs } from "../../attrs/index.js";
 import { applyRunFormattingOverrideMark, buildRunFormattingOverrideAttrs } from "./RunFormattingOverrideExtension.js";
 //#region src/prosemirror/extensions/marks/markUtils.ts
+const isFontTheme = (value) => value !== void 0 && FONT_THEME_VALUES.some((theme) => theme === value);
+const fontFamilyAttrsToFormatting = ({ ascii, hAnsi, eastAsia, cs, hint, asciiTheme, hAnsiTheme, eastAsiaTheme, csTheme }) => ({
+	...ascii !== void 0 ? { ascii } : {},
+	...hAnsi !== void 0 ? { hAnsi } : {},
+	...eastAsia !== void 0 ? { eastAsia } : {},
+	...cs !== void 0 ? { cs } : {},
+	...hint !== void 0 ? { hint } : {},
+	...isFontTheme(asciiTheme) ? { asciiTheme } : {},
+	...hAnsiTheme !== void 0 ? { hAnsiTheme } : {},
+	...eastAsiaTheme !== void 0 ? { eastAsiaTheme } : {},
+	...csTheme !== void 0 ? { csTheme } : {}
+});
 function marksToTextFormatting(marks) {
 	const formatting = {};
 	for (const mark of marks) switch (mark.type.name) {
@@ -10,7 +25,10 @@ function marksToTextFormatting(marks) {
 			formatting.italic = true;
 			break;
 		case "underline":
-			formatting.underline = { style: typeof mark.attrs["style"] === "string" ? mark.attrs["style"] : "single" };
+			formatting.underline = {
+				style: typeof mark.attrs["style"] === "string" ? mark.attrs["style"] : "single",
+				...mark.attrs["color"] !== null && mark.attrs["color"] !== void 0 ? { color: mark.attrs["color"] } : {}
+			};
 			break;
 		case "strike":
 			formatting.strike = true;
@@ -34,17 +52,9 @@ function marksToTextFormatting(marks) {
 		case "fontSize":
 			formatting.fontSize = Number(mark.attrs["size"]);
 			break;
-		case "fontFamily": {
-			const ascii = mark.attrs["ascii"] !== null && mark.attrs["ascii"] !== void 0 ? String(mark.attrs["ascii"]) : void 0;
-			const hAnsi = mark.attrs["hAnsi"] !== null && mark.attrs["hAnsi"] !== void 0 ? String(mark.attrs["hAnsi"]) : void 0;
-			const hint = mark.attrs["hint"];
-			formatting.fontFamily = {
-				...ascii !== void 0 ? { ascii } : {},
-				...hAnsi !== void 0 ? { hAnsi } : {},
-				...hint === "default" || hint === "eastAsia" || hint === "cs" ? { hint } : {}
-			};
+		case "fontFamily":
+			formatting.fontFamily = fontFamilyAttrsToFormatting(expectFontFamilyMarkAttrs(mark));
 			break;
-		}
 		case "language": {
 			const val = mark.attrs["val"];
 			const eastAsia = mark.attrs["eastAsia"];
@@ -93,21 +103,82 @@ function dispatchStoredMarks(state, dispatch, marks) {
 	tr.setStoredMarks(marks);
 	dispatch(tr);
 }
+function compactAttrs(attrs) {
+	if (!attrs) return {};
+	const result = {};
+	for (const [key, value] of Object.entries(attrs)) if (value !== null && value !== void 0) result[key] = value;
+	return result;
+}
+function mergeMarkAttrs(markType, currentMark, nextAttrs) {
+	const next = compactAttrs(nextAttrs);
+	switch (markType.name) {
+		case "fontFamily": return mergeFontFamily(currentMark ? fontFamilyAttrsToFormatting(expectFontFamilyMarkAttrs(currentMark)) : void 0, fontFamilyAttrsToFormatting(expectFontFamilyMarkAttrs(markType.create(next))));
+		case "underline": return {
+			...compactAttrs(currentMark?.attrs),
+			...next
+		};
+		default: return nextAttrs;
+	}
+}
+function markRequiresAttrMerge(markType) {
+	return markType.name === "fontFamily" || markType.name === "underline";
+}
+function createMarkWithMergedAttrs(markType, currentMark, nextAttrs) {
+	if (!markRequiresAttrMerge(markType)) return markType.create(nextAttrs);
+	return markType.create(mergeMarkAttrs(markType, currentMark, nextAttrs));
+}
 function setMark(markType, attrs) {
 	return (state, dispatch) => {
 		const { from, to, empty } = state.selection;
-		const mark = markType.create(attrs);
 		if (empty) {
 			if (dispatch) {
 				const current = state.storedMarks ?? state.selection.$from.marks();
-				dispatchStoredMarks(state, dispatch, [...markType.isInSet(current) ? current.filter((m) => m.type !== markType) : current, mark]);
+				const currentMark = markType.isInSet(current);
+				const marks = markType.isInSet(current) ? current.filter((m) => m.type !== markType) : current;
+				const mark = createMarkWithMergedAttrs(markType, currentMark, attrs);
+				dispatchStoredMarks(state, dispatch, [...marks, mark]);
 			}
 			return true;
 		}
-		if (dispatch) dispatch(state.tr.addMark(from, to, mark).scrollIntoView());
+		if (dispatch) {
+			if (!markRequiresAttrMerge(markType)) {
+				dispatch(state.tr.addMark(from, to, markType.create(attrs)).scrollIntoView());
+				return true;
+			}
+			let tr = state.tr;
+			state.doc.nodesBetween(from, to, (node, pos) => {
+				if (!node.isText) return;
+				const start = Math.max(from, pos);
+				const end = Math.min(to, pos + node.nodeSize);
+				const mark = createMarkWithMergedAttrs(markType, markType.isInSet(node.marks), attrs);
+				tr = tr.addMark(start, end, mark);
+			});
+			dispatch(tr.scrollIntoView());
+		}
 		return true;
 	};
 }
+function selectionHasVisibleUnderline(state, markType) {
+	const { from, to, empty, $from } = state.selection;
+	if (empty) {
+		const mark = markType.isInSet(state.storedMarks ?? $from.marks());
+		return mark !== void 0 && mark.attrs["style"] !== "none";
+	}
+	let hasVisibleUnderline = false;
+	state.doc.nodesBetween(from, to, (node) => {
+		if (!node.isText) return true;
+		const mark = markType.isInSet(node.marks);
+		if (mark && mark.attrs["style"] !== "none") {
+			hasVisibleUnderline = true;
+			return false;
+		}
+		return true;
+	});
+	return hasVisibleUnderline;
+}
+function toggleUnderlineMark(markType) {
+	return (state, dispatch) => setMark(markType, { style: selectionHasVisibleUnderline(state, markType) ? "none" : "single" })(state, dispatch);
+}
 function removeMark(markType) {
 	return (state, dispatch) => {
 		const { from, to, empty } = state.selection;
@@ -197,8 +268,13 @@ function textFormattingToMarks(formatting, schema) {
 	if (formatting.fontFamily && schema.marks["fontFamily"]) marks.push(schema.marks["fontFamily"].create({
 		ascii: formatting.fontFamily.ascii,
 		hAnsi: formatting.fontFamily.hAnsi,
+		eastAsia: formatting.fontFamily.eastAsia,
+		cs: formatting.fontFamily.cs,
 		hint: formatting.fontFamily.hint,
-		asciiTheme: formatting.fontFamily.asciiTheme
+		asciiTheme: formatting.fontFamily.asciiTheme,
+		hAnsiTheme: formatting.fontFamily.hAnsiTheme,
+		eastAsiaTheme: formatting.fontFamily.eastAsiaTheme,
+		csTheme: formatting.fontFamily.csTheme
 	}));
 	if (formatting.language && schema.marks["language"]) marks.push(schema.marks["language"].create(formatting.language));
 	if (formatting.vertAlign === "superscript" && schema.marks["superscript"]) marks.push(schema.marks["superscript"].create());
@@ -245,4 +321,4 @@ function createRemoveMarkCommand(markType) {
 	return removeMark(markType);
 }
 //#endregion
-export { clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, removeMark, setMark, textFormattingToMarks };
+export { clearFormatting, createRemoveMarkCommand, createSetMarkCommand, getMarkAttr, isMarkActive, removeMark, setMark, textFormattingToMarks, toggleUnderlineMark };

package/dist/prosemirror/plugins/selectionTracker.js

@@ -1,3 +1,4 @@
+import { collectMarksInRange } from "../selectionMarks.js";
 import { Plugin, PluginKey } from "prosemirror-state";
 //#region src/prosemirror/plugins/selectionTracker.ts
 /**
@@ -32,7 +33,7 @@ function extractSelectionContext(state) {
 	const paragraphFormatting = {};
 	if (paragraph.type.name === "paragraph") {
 		if (paragraph.attrs["alignment"]) paragraphFormatting.alignment = paragraph.attrs["alignment"];
-		if (paragraph.attrs["lineSpacing"]) {
+		if (typeof paragraph.attrs["lineSpacing"] === "number") {
 			paragraphFormatting.lineSpacing = paragraph.attrs["lineSpacing"];
 			paragraphFormatting.lineSpacingRule = paragraph.attrs["lineSpacingRule"];
 		}
@@ -79,9 +80,13 @@ function extractSelectionContext(state) {
 * Extract text formatting from current selection/cursor marks
 */
 function extractTextFormatting(state) {
-	const { selection } = state;
-	const { empty, $from } = selection;
-	const marks = state.storedMarks || (empty ? $from.marks() : []);
+	const { selection, doc } = state;
+	const { from, to, empty, $from } = selection;
+	const marks = empty ? state.storedMarks || $from.marks() : collectMarksInRange({
+		doc,
+		from,
+		to
+	});
 	const formatting = {};
 	for (const mark of marks) switch (mark.type.name) {
 		case "bold":
@@ -91,7 +96,7 @@ function extractTextFormatting(state) {
 			formatting.italic = true;
 			break;
 		case "underline":
-			formatting.underline = {
+			if (mark.attrs["style"] !== "none") formatting.underline = {
 				style: mark.attrs["style"] || "single",
 				color: mark.attrs["color"]
 			};

package/dist/prosemirror/schema/nodes.d.ts

@@ -32,6 +32,7 @@ type ParagraphAttrs = {
   spaceAfter?: number;
   lineSpacing?: number;
   lineSpacingRule?: document_d_exports.LineSpacingRule;
+  lineSpacingExplicit?: boolean;
   snapToGrid?: boolean;
   spacingExplicit?: SpacingExplicit;
   /** Layout provenance: document defaults survive on empty paragraphs. */

package/dist/prosemirror/selectionMarks.d.ts

@@ -0,0 +1,11 @@
+import { Mark, Node } from "prosemirror-model";
+//#region src/prosemirror/selectionMarks.d.ts
+type CollectMarksInRangeOptions = {
+  doc: Node;
+  from: number;
+  to: number;
+};
+/** Collect one representative per mark type, preferring visible underline state. */
+declare const collectMarksInRange: ({ doc, from, to }: CollectMarksInRangeOptions) => Mark[];
+//#endregion
+export { collectMarksInRange };

package/dist/prosemirror/selectionMarks.js

@@ -0,0 +1,19 @@
+//#region src/prosemirror/selectionMarks.ts
+const UNDERLINE_MARK = "underline";
+const HIDDEN_UNDERLINE_STYLE = "none";
+const shouldReplaceMark = (current, incoming) => current.type.name === UNDERLINE_MARK && current.attrs["style"] === HIDDEN_UNDERLINE_STYLE && incoming.attrs["style"] !== HIDDEN_UNDERLINE_STYLE;
+/** Collect one representative per mark type, preferring visible underline state. */
+const collectMarksInRange = ({ doc, from, to }) => {
+	const seen = /* @__PURE__ */ new Map();
+	doc.nodesBetween(from, to, (node) => {
+		if (!node.isText) return;
+		for (const mark of node.marks) {
+			const name = mark.type.name;
+			const current = seen.get(name);
+			if (!current || shouldReplaceMark(current, mark)) seen.set(name, mark);
+		}
+	});
+	return Array.from(seen.values());
+};
+//#endregion
+export { collectMarksInRange };

package/dist/prosemirror/selectionState.js

@@ -1,4 +1,5 @@
 import { directionIsRtl } from "./paragraphDirection.js";
+import { collectMarksInRange } from "./selectionMarks.js";
 //#region src/prosemirror/selectionState.ts
 /**
 * Extract selection state from editor state.
@@ -18,7 +19,11 @@ function extractSelectionState(state) {
 	const paragraph = $from.parent;
 	const isEmptyParagraph = paragraph.type.name === "paragraph" && paragraph.textContent.length === 0;
 	const paragraphDefaultFormatting = paragraph.attrs["defaultTextFormatting"];
-	const marks = empty ? state.storedMarks || selection.$from.marks() : collectMarksInRange(doc, from, to);
+	const marks = empty ? state.storedMarks || selection.$from.marks() : collectMarksInRange({
+		doc,
+		from,
+		to
+	});
 	if (isEmptyParagraph && marks.length === 0 && paragraphDefaultFormatting) textFormatting = { ...paragraphDefaultFormatting };
 	for (const mark of marks) switch (mark.type.name) {
 		case "bold":
@@ -28,7 +33,7 @@ function extractSelectionState(state) {
 			textFormatting.italic = true;
 			break;
 		case "underline":
-			textFormatting.underline = {
+			if (mark.attrs["style"] !== "none") textFormatting.underline = {
 				style: mark.attrs["style"] || "single",
 				color: mark.attrs["color"]
 			};
@@ -67,7 +72,7 @@ function extractSelectionState(state) {
 	let styleId = null;
 	if (paragraph.type.name === "paragraph") {
 		if (paragraph.attrs["alignment"]) paragraphFormatting.alignment = paragraph.attrs["alignment"];
-		if (paragraph.attrs["lineSpacing"]) {
+		if (typeof paragraph.attrs["lineSpacing"] === "number") {
 			paragraphFormatting.lineSpacing = paragraph.attrs["lineSpacing"];
 			paragraphFormatting.lineSpacingRule = paragraph.attrs["lineSpacingRule"];
 		}
@@ -91,22 +96,5 @@ function extractSelectionState(state) {
 		endParagraphIndex
 	};
 }
-/**
-* Collect the first occurrence of each mark type found on any text node within
-* the range. Mirrors the "any inline child has this mark" semantics that
-* prosemirror-commands' toggleMark uses to decide add-vs-remove, so the
-* toolbar's active state stays consistent with what a toggle click will do.
-*/
-function collectMarksInRange(doc, from, to) {
-	const seen = /* @__PURE__ */ new Map();
-	doc.nodesBetween(from, to, (node) => {
-		if (!node.isText) return;
-		for (const mark of node.marks) {
-			const name = mark.type.name;
-			if (!seen.has(name)) seen.set(name, mark);
-		}
-	});
-	return Array.from(seen.values());
-}
 //#endregion
 export { extractSelectionState };

package/dist/prosemirror/styles/resolvedStyleAttrs.js

@@ -27,6 +27,7 @@ function paragraphAttrsFromResolvedStyle(resolved) {
 		spaceAfter: ppr?.spaceAfter ?? null,
 		lineSpacing: ppr?.lineSpacing ?? null,
 		lineSpacingRule: ppr?.lineSpacingRule ?? null,
+		lineSpacingExplicit: null,
 		snapToGrid: ppr?.snapToGrid ?? null,
 		indentLeft: ppr?.indentLeft ?? null,
 		indentRight: ppr?.indentRight ?? null,

package/dist/redline.d.ts

@@ -13,13 +13,13 @@ type GenerateRedlineDocxOptions = {
   /** Optional output-only package-metadata privacy transforms. */
   privacy?: FolioDocumentPrivacyOptions;
 };
-declare const InvalidGenerateRedlineDocxOptionsError_base: import("better-result").TaggedErrorClass<"InvalidGenerateRedlineDocxOptionsError", {
+declare const InvalidGenerateRedlineDocxOptionsError_base: import("better-result").TaggedErrorClass<"InvalidGenerateRedlineDocxOptionsError">;
+/** Raised when a resolved input view is not `"original"` or `"final"`. */
+declare class InvalidGenerateRedlineDocxOptionsError extends InvalidGenerateRedlineDocxOptionsError_base<{
   message: string;
   option: "baseView" | "revisedView";
   receivedValue: unknown;
-}>;
-/** Raised when a resolved input view is not `"original"` or `"final"`. */
-declare class InvalidGenerateRedlineDocxOptionsError extends InvalidGenerateRedlineDocxOptionsError_base {}
+}> {}
 /** A document story that could not be paired across the two input packages. */
 type GenerateRedlineUnprocessedStory = {
   /** Story in the base package, or `null` when it exists only in the revision. */

package/dist/redline.js

@@ -18,7 +18,7 @@ import { TaggedError, panic } from "better-result";
 * @packageDocumentation
 */
 /** Raised when a resolved input view is not `"original"` or `"final"`. */
-var InvalidGenerateRedlineDocxOptionsError = class extends TaggedError("InvalidGenerateRedlineDocxOptionsError")() {};
+var InvalidGenerateRedlineDocxOptionsError = class extends TaggedError("InvalidGenerateRedlineDocxOptionsError") {};
 const nextBaseBlockIdByIndex = (events) => {
 	const nextIds = Array.from({ length: events.length });
 	let nextId = null;

package/dist/utils/formatToStyle.js

@@ -108,7 +108,7 @@ function paragraphToStyle(formatting, theme) {
 	}
 	if (formatting.indentLeft !== void 0) style.marginLeft = formatPx(twipsToPixels(formatting.indentLeft));
 	if (formatting.indentRight !== void 0) style.marginRight = formatPx(twipsToPixels(formatting.indentRight));
-	if (formatting.indentFirstLine !== void 0) style.textIndent = formatPx(twipsToPixels(formatting.indentFirstLine));
+	if (formatting.indentFirstLine !== void 0) style.textIndent = formatPx(twipsToPixels(formatting.hangingIndent ? -Math.abs(formatting.indentFirstLine) : formatting.indentFirstLine));
 	if (formatting.borders) {
 		if (formatting.borders.top) Object.assign(style, borderToStyle(formatting.borders.top, "Top", theme));
 		if (formatting.borders.bottom) Object.assign(style, borderToStyle(formatting.borders.bottom, "Bottom", theme));

package/dist/version-comparison.d.ts

@@ -15,12 +15,12 @@ type FolioCompareDocxVersionsOptions = {
   /** Optional output-only privacy transforms. Source buffers are never mutated. */
   privacy?: FolioVersionDiffPrivacyOptions;
 };
-declare const InvalidFolioVersionComparisonOptionsError_base: import("better-result").TaggedErrorClass<"InvalidFolioVersionComparisonOptionsError", {
+declare const InvalidFolioVersionComparisonOptionsError_base: import("better-result").TaggedErrorClass<"InvalidFolioVersionComparisonOptionsError">;
+declare class InvalidFolioVersionComparisonOptionsError extends InvalidFolioVersionComparisonOptionsError_base<{
   message: string;
   option: "include" | "privacy.transforms";
   receivedValue: unknown;
-}>;
-declare class InvalidFolioVersionComparisonOptionsError extends InvalidFolioVersionComparisonOptionsError_base {}
+}> {}
 type FolioDocumentMetadataValue = string | number | null;
 type FolioMetadataDiff = {
   property: FolioDocumentMetadataProperty;

package/dist/version-comparison.js

@@ -86,7 +86,7 @@ const FOLIO_VERSION_COMPARISON_SCOPES = Object.freeze([
 	"metadata"
 ]);
 const isFolioVersionComparisonScope = (value) => FOLIO_VERSION_COMPARISON_SCOPES.some((scope) => scope === value);
-var InvalidFolioVersionComparisonOptionsError = class extends TaggedError("InvalidFolioVersionComparisonOptionsError")() {};
+var InvalidFolioVersionComparisonOptionsError = class extends TaggedError("InvalidFolioVersionComparisonOptionsError") {};
 const FOLIO_VERSION_COMPARISON_PRIVACY_TRANSFORMS = FOLIO_DOCUMENT_PRIVACY_TRANSFORMS;
 const isFolioVersionComparisonPrivacyTransform = (value) => isFolioDocumentPrivacyTransform(value);
 /** Run-level formatting properties compared for `formatChanged` detection. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.22.1",
+  "version": "0.22.3",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",
@@ -113,10 +113,10 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.15.0",
+    "@stll/docx-core": "^0.15.1",
     "@stll/docx-utils": "^0.1.0",
     "@stll/template-conditions": "^0.1.0",
-    "better-result": "2.10.0",
+    "better-result": "3.0.1",
     "csstype": "^3.1.3",
     "dompurify": "^3.4.13",
     "fast-xml-parser": "^5.9.3",