@stll/folio-core 0.47.7 → 0.49.0

package/dist/utils/textFormattingMerge.js

@@ -15,21 +15,27 @@ const STYLE_TOGGLE_KEYS = [
 	"hidden"
 ];
 /**
-* Merge the properties exposed by one resolved style definition.
+* Merge one style's own run-formatting declarations onto its already-resolved
+* `w:basedOn` ancestor.
 *
-* A false toggle at a child style level does not cancel the inherited state. The
-* ordinary merge remains unchanged for direct formatting and non-toggle properties.
+* ECMA-376 §17.7.3 resolves a toggle property (bold, italic, allCaps, ...) for a
+* single style tier by walking the `basedOn` chain from the style itself towards
+* its root: read the value the style declares; if it declares none, move to the
+* parent and repeat. The first value found — whether an explicit "on" or an
+* explicit "off" — is that tier's value, and it is *not* combined with whatever
+* a weaker ancestor further up the chain happened to say. A style's own
+* `<w:b w:val="0"/>` therefore turns bold off outright, even when its base style
+* is bold; it does not defer to the base.
+*
+* That is exactly last-defined-wins, i.e. `mergeTextFormatting`'s existing
+* behaviour for every other property. The toggle behaviour §17.7.3 is actually
+* known for — combining a table style's, a paragraph style's and a character
+* style's resolved values by Boolean XOR — combines the *outputs* of separate
+* `basedOn` walks like this one; it is not part of resolving a single walk, so
+* it has no place in this function.
 */
 function mergeStyleTextFormatting(target, source) {
-	const result = mergeTextFormatting(target, source);
-	if (!result || !source) return result;
-	for (const key of STYLE_TOGGLE_KEYS) {
-		if (source[key] !== false) continue;
-		const inherited = target?.[key];
-		if (inherited === void 0) Reflect.deleteProperty(result, key);
-		else result[key] = inherited;
-	}
-	return result;
+	return mergeTextFormatting(target, source);
 }
 /**
 * A merge answers "what does this text look like once the style, the paragraph

package/dist/utils/trailingText.d.ts

@@ -0,0 +1,22 @@
+//#region src/utils/trailingText.d.ts
+/**
+ * Linear scans over the end of a text run. Layout calls these on every
+ * measure and paint pass, and run text can be arbitrarily long, so they
+ * must not backtrack the way an end-anchored regular expression does.
+ */
+/** Index where the trailing run of U+0020 spaces begins; `text.length` when there is none. */
+declare function trailingSpaceStart(text: string): number;
+type TrailingToken = {
+  /** Last run of non-whitespace characters. */
+  token: string;
+  /** Whitespace after the token, up to the end of the text. */
+  separator: string;
+};
+/**
+ * Split off the last whitespace-delimited token and the whitespace that
+ * follows it, or return undefined when the text has no non-whitespace
+ * character.
+ */
+declare function splitTrailingToken(text: string): TrailingToken | undefined;
+//#endregion
+export { TrailingToken, splitTrailingToken, trailingSpaceStart };

package/dist/utils/trailingText.js

@@ -0,0 +1,32 @@
+//#region src/utils/trailingText.ts
+/**
+* Linear scans over the end of a text run. Layout calls these on every
+* measure and paint pass, and run text can be arbitrarily long, so they
+* must not backtrack the way an end-anchored regular expression does.
+*/
+const WHITESPACE = /\s/u;
+const isWhitespaceUnit = (text, index) => WHITESPACE.test(text.charAt(index));
+/** Index where the trailing run of U+0020 spaces begins; `text.length` when there is none. */
+function trailingSpaceStart(text) {
+	let start = text.length;
+	while (start > 0 && text.charCodeAt(start - 1) === 32) start--;
+	return start;
+}
+/**
+* Split off the last whitespace-delimited token and the whitespace that
+* follows it, or return undefined when the text has no non-whitespace
+* character.
+*/
+function splitTrailingToken(text) {
+	let tokenEnd = text.length;
+	while (tokenEnd > 0 && isWhitespaceUnit(text, tokenEnd - 1)) tokenEnd--;
+	if (tokenEnd === 0) return;
+	let tokenStart = tokenEnd;
+	while (tokenStart > 0 && !isWhitespaceUnit(text, tokenStart - 1)) tokenStart--;
+	return {
+		token: text.slice(tokenStart, tokenEnd),
+		separator: text.slice(tokenEnd)
+	};
+}
+//#endregion
+export { splitTrailingToken, trailingSpaceStart };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.47.7",
+  "version": "0.49.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",
@@ -128,7 +128,7 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.25.3",
+    "@stll/docx-core": "^0.27.0",
     "@stll/docx-utils": "^0.1.0",
     "@stll/template-conditions": ">=0.4.0 <1.0.0",
     "better-result": "3.0.1",

package/dist/layout-engine/justifiedLineFit.d.ts

@@ -1,7 +0,0 @@
-import { ParagraphBlock } from "./types.js";
-//#region src/layout-engine/justifiedLineFit.d.ts
-declare const JUSTIFIED_FINAL_LINE_MAX_SHRINK_RATIO = 0.025;
-declare const JUSTIFIED_FINAL_LINE_SPACE_CONTRACTION_RATIO = 0.32;
-declare const supportsJustifiedFinalLineContraction: (block: ParagraphBlock) => boolean;
-//#endregion
-export { JUSTIFIED_FINAL_LINE_MAX_SHRINK_RATIO, JUSTIFIED_FINAL_LINE_SPACE_CONTRACTION_RATIO, supportsJustifiedFinalLineContraction };

package/dist/layout-engine/justifiedLineFit.js

@@ -1,6 +0,0 @@
-//#region src/layout-engine/justifiedLineFit.ts
-const JUSTIFIED_FINAL_LINE_MAX_SHRINK_RATIO = .025;
-const JUSTIFIED_FINAL_LINE_SPACE_CONTRACTION_RATIO = .32;
-const supportsJustifiedFinalLineContraction = (block) => block.attrs?.alignment === "justify" && block.attrs.justificationCompatibility?.type !== "legacy" && (block.attrs.listMarker !== void 0 || (block.attrs.indent?.left ?? 0) > 0);
-//#endregion
-export { JUSTIFIED_FINAL_LINE_MAX_SHRINK_RATIO, JUSTIFIED_FINAL_LINE_SPACE_CONTRACTION_RATIO, supportsJustifiedFinalLineContraction };