@stll/folio-core 0.43.0 → 0.44.0

package/dist/utils/headingCollector.js

@@ -1,34 +1,32 @@
+import { resolveHeadingLevel } from "../docx/builtInStyles.js";
 //#region src/utils/headingCollector.ts
 /**
-* Collect all headings from a ProseMirror document.
+* Collect all headings from a ProseMirror document, in document order.
 *
-* Detection logic:
-* 1. Check `outlineLevel` attr (set by OOXML parsing or style resolution)
-* 2. Fallback to `styleId` matching /^[Hh]eading(\d)$/
+* Classification is {@link resolveHeadingLevel}'s: the paragraph's effective
+* outline level, else the style's built-in `w:name`. Pass the open document's
+* index (`styleResolver.builtInStyles`) so a localized style id such as
+* `Nadpis1` or `berschrift1` resolves through its name rather than falling out
+* of the outline.
 */
-function collectHeadings(doc) {
+function collectHeadings(doc, styles) {
 	const headings = [];
 	doc.descendants((node, pos) => {
-		if (node.type.name === "paragraph") {
-			const level = node.attrs["outlineLevel"];
-			const styleId = node.attrs["styleId"];
-			let effectiveLevel = level;
-			if (effectiveLevel === null && styleId) {
-				const match = /^[Hh]eading(?<level>\d)$/u.exec(styleId);
-				if (match) effectiveLevel = Number.parseInt(match.groups["level"], 10) - 1;
-			}
-			if (effectiveLevel !== null && effectiveLevel >= 0 && effectiveLevel <= 8) {
-				let text = "";
-				node.forEach((child) => {
-					if (child.isText) text += child.text || "";
-				});
-				if (text.trim()) headings.push({
-					text: text.trim(),
-					level: effectiveLevel,
-					pmPos: pos
-				});
-			}
-		}
+		if (node.type.name !== "paragraph") return;
+		const level = resolveHeadingLevel({
+			outlineLevel: node.attrs["outlineLevel"],
+			styleId: node.attrs["styleId"]
+		}, styles);
+		if (level === void 0) return;
+		let text = "";
+		node.forEach((child) => {
+			if (child.isText) text += child.text || "";
+		});
+		if (text.trim()) headings.push({
+			text: text.trim(),
+			level,
+			pmPos: pos
+		});
 	});
 	return headings;
 }

package/dist/utils/tableOfContentsStyle.js

@@ -1,6 +1,13 @@
+import { normalizeStyleName } from "../docx/builtInStyles.js";
 //#region src/utils/tableOfContentsStyle.ts
 const TABLE_OF_CONTENTS_STYLE_ID = /^TOC(?<level>\d*)$/iu;
-const TABLE_OF_CONTENTS_STYLE_NAME = /^toc\s+(?<level>\d+)$/iu;
+/**
+* Against an already-normalised name, so the same tolerance applies here as in
+* `builtInStyles.ts`: the corpus carries `toc 1`, `TOC 1` and even `TOC  1`
+* with a double space, and a producer that drops the space entirely would
+* otherwise fall out.
+*/
+const TABLE_OF_CONTENTS_STYLE_NAME = /^toc(?<level>\d+)$/u;
 const parsedLevel = (match) => {
 	if (!match) return;
 	const rawLevel = match.groups?.["level"];
@@ -9,6 +16,6 @@ const parsedLevel = (match) => {
 	return Number.isSafeInteger(level) && level > 0 ? level : void 0;
 };
 /** Resolve a built-in TOC entry style without relying on its localized style id. */
-const tableOfContentsStyleLevel = ({ styleId, styleName }) => parsedLevel(TABLE_OF_CONTENTS_STYLE_ID.exec(styleId ?? "")) ?? parsedLevel(TABLE_OF_CONTENTS_STYLE_NAME.exec(styleName ?? ""));
+const tableOfContentsStyleLevel = ({ styleId, styleName }) => parsedLevel(TABLE_OF_CONTENTS_STYLE_ID.exec(styleId ?? "")) ?? parsedLevel(TABLE_OF_CONTENTS_STYLE_NAME.exec(normalizeStyleName(styleName ?? "")));
 //#endregion
 export { tableOfContentsStyleLevel };

package/package.json

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

package/dist/docx/textWhitespace.d.ts

@@ -1,4 +0,0 @@
-//#region src/docx/textWhitespace.d.ts
-declare const requiresXmlSpacePreserve: (text: string) => boolean;
-//#endregion
-export { requiresXmlSpacePreserve };

package/dist/docx/textWhitespace.js

@@ -1,4 +0,0 @@
-//#region src/docx/textWhitespace.ts
-const requiresXmlSpacePreserve = (text) => text.startsWith(" ") || text.endsWith(" ") || text.includes("  ");
-//#endregion
-export { requiresXmlSpacePreserve };

package/dist/layout-bridge/engine/tableWidthUtils.d.ts

@@ -1,6 +0,0 @@
-import { document_d_exports } from "../../types/document.js";
-//#region src/layout-bridge/engine/tableWidthUtils.d.ts
-declare function resolveTableWidthPx(width: number | undefined, widthType: document_d_exports.TableWidthType | undefined, containerWidth: number): number | undefined;
-declare function normalizeTableColumnWidths(widths: number[], columnCount: number, targetWidth: number): number[];
-//#endregion
-export { normalizeTableColumnWidths, resolveTableWidthPx };

package/dist/layout-bridge/engine/tableWidthUtils.js

@@ -1,25 +0,0 @@
-//#region src/layout-bridge/engine/tableWidthUtils.ts
-const TWIPS_PER_INCH = 1440;
-const PX_PER_INCH = 96;
-const PCT_DENOMINATOR = 5e3;
-const twipsToPixels = (twips) => twips / TWIPS_PER_INCH * PX_PER_INCH;
-function resolveTableWidthPx(width, widthType, containerWidth) {
-	if (width === void 0 || width <= 0) return;
-	if (widthType === "dxa") return twipsToPixels(width);
-	if (widthType === "pct") return width / PCT_DENOMINATOR * containerWidth;
-}
-function normalizeTableColumnWidths(widths, columnCount, targetWidth) {
-	if (columnCount <= 0) return [];
-	if (widths.length === 0) return Array.from({ length: columnCount }, () => targetWidth / columnCount);
-	const normalized = widths.slice(0, columnCount);
-	const positives = normalized.filter((width) => width > 0);
-	const fallback = positives.length > 0 ? positives.reduce((sum, width) => sum + width, 0) / positives.length : targetWidth / columnCount;
-	while (normalized.length < columnCount) normalized.push(fallback);
-	let fixedTotal = 0;
-	for (const width of normalized) if (width > 0) fixedTotal += width;
-	const missingCount = normalized.filter((width) => width <= 0).length;
-	const missingWidth = missingCount > 0 ? Math.max(0, targetWidth - fixedTotal) / missingCount : 0;
-	return normalized.map((width) => width > 0 ? width : missingWidth);
-}
-//#endregion
-export { normalizeTableColumnWidths, resolveTableWidthPx };

package/dist/markdown/headings.d.ts

@@ -1,13 +0,0 @@
-//#region src/markdown/headings.d.ts
-/**
- * Heading-style detection from a paragraph style id. Ported from eigenpal
- * `agent/text-utils` (PR #595) so the markdown exporter stays self-contained
- * (folio has no `agent/text-utils` module). Word's built-in heading styles are
- * `Heading1`…`Heading9` (and localised aliases that still contain "heading").
- */
-/** True when the style id denotes a Word heading style. */
-declare function isHeadingStyle(styleId?: string): boolean;
-/** Extract the 1-based heading level from a style id, or undefined. */
-declare function parseHeadingLevel(styleId?: string): number | undefined;
-//#endregion
-export { isHeadingStyle, parseHeadingLevel };

package/dist/markdown/headings.js

@@ -1,20 +0,0 @@
-//#region src/markdown/headings.ts
-/**
-* Heading-style detection from a paragraph style id. Ported from eigenpal
-* `agent/text-utils` (PR #595) so the markdown exporter stays self-contained
-* (folio has no `agent/text-utils` module). Word's built-in heading styles are
-* `Heading1`…`Heading9` (and localised aliases that still contain "heading").
-*/
-/** True when the style id denotes a Word heading style. */
-function isHeadingStyle(styleId) {
-	if (!styleId) return false;
-	return styleId.toLowerCase().includes("heading");
-}
-/** Extract the 1-based heading level from a style id, or undefined. */
-function parseHeadingLevel(styleId) {
-	if (!styleId) return;
-	const digit = /heading\s*(?<level>\d)/iu.exec(styleId)?.groups?.["level"];
-	if (digit) return Number.parseInt(digit, 10);
-}
-//#endregion
-export { isHeadingStyle, parseHeadingLevel };