@stll/folio-core 0.25.1 → 0.25.3

package/dist/prosemirror/conversion/toProseDoc.js

@@ -30,6 +30,11 @@ const createTextBoxGroupIdFactory = () => {
 	let index = 0;
 	return () => `${salt}:${index++}`;
 };
+/** Keep imported hyperlink identity unique across every nested conversion scope. */
+const createHyperlinkInstanceIndexAllocator = () => {
+	let index = 0;
+	return () => index++;
+};
 /**
 * Convert a Document to a ProseMirror document
 *
@@ -42,6 +47,11 @@ function toProseDoc(document, options) {
 	const styleResolver = createStyleEngine(options?.styles ?? document.package.styles);
 	const theme = options?.theme ?? document.package.theme ?? null;
 	const nextTextBoxGroupId = createTextBoxGroupIdFactory();
+	const conversionContext = {
+		theme,
+		nextTextBoxGroupId,
+		nextHyperlinkInstanceIndex: createHyperlinkInstanceIndexAllocator()
+	};
 	const convertBodyBlocks = (blocks) => {
 		const out = [];
 		for (const block of blocks) if (block.type === "paragraph") {
@@ -49,10 +59,7 @@ function toProseDoc(document, options) {
 			if (pbPos === "before") out.push(schema.node("pageBreak"));
 			const converted = convertParagraphWithTextBoxes(block, styleResolver, {
 				textBoxGroupId: nextTextBoxGroupId(),
-				context: {
-					theme,
-					nextTextBoxGroupId
-				}
+				context: conversionContext
 			});
 			const firstConverted = converted.at(0);
 			if (pbPos === "before" && converted.length === 1 && firstConverted?.type.name === "paragraph" && firstConverted.content.size === 0 && document.package.settings?.splitPageBreakAndParagraphMark !== true) {
@@ -72,10 +79,7 @@ function toProseDoc(document, options) {
 			}
 			out.push(...converted);
 			if (pbPos === "after") out.push(schema.node("pageBreak"));
-		} else if (block.type === "table") out.push(convertTable(block, styleResolver, {
-			theme,
-			nextTextBoxGroupId
-		}));
+		} else if (block.type === "table") out.push(convertTable(block, styleResolver, conversionContext));
 		else out.push(convertBlockSdt(block, convertBodyBlocks));
 		return out;
 	};
@@ -122,14 +126,13 @@ function convertBlockSdt(blockSdt, convertBlocks) {
 * Resolves style-based text formatting and passes it to runs so that
 * paragraph styles (like Heading1) apply their font size, color, etc.
 */
-function convertParagraph(paragraph, styleResolver, activeCommentIds, extraRunFormatting, tableParagraphOverlay, textBoxAnchors) {
+function convertParagraph(paragraph, styleResolver, nextHyperlinkInstanceIndex, activeCommentIds, extraRunFormatting, tableParagraphOverlay, textBoxAnchors) {
 	const attrs = paragraphFormattingToAttrs(paragraph, styleResolver, tableParagraphOverlay);
 	const isTocParagraph = isTocStyleId(paragraph.formatting?.styleId);
 	const inlineNodes = [];
 	let inlineOffset = 0;
 	let bookmarksArr;
 	let emptyHyperlinks;
-	let hyperlinkIndex = 0;
 	const commentIds = activeCommentIds ?? /* @__PURE__ */ new Set();
 	const emitInlineNodes = (nodes) => {
 		if (nodes.length === 0) return;
@@ -160,7 +163,7 @@ function convertParagraph(paragraph, styleResolver, activeCommentIds, extraRunFo
 		return suppressParagraphMarkFormatting(baseRunFormatting, inheritableParagraphRunFormatting, formatting, paragraphMarkPrecedesStyle);
 	};
 	const emitTrackedChange = (change, markType, moveKind) => {
-		emitInlineNodes(convertTrackedChange(change, markType, getInheritedRunFormatting, styleResolver, moveKind, textBoxAnchors));
+		emitInlineNodes(convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, getInheritedRunFormatting, styleResolver, moveKind, textBoxAnchors));
 	};
 	for (const content of paragraph.content) {
 		if (content.type === "commentRangeStart") commentIds.add(content.id);
@@ -168,12 +171,10 @@ function convertParagraph(paragraph, styleResolver, activeCommentIds, extraRunFo
 		else if (content.type === "commentReference") anchorPointComment(inlineNodes, content.id);
 		else if (content.type === "run") emitInlineNodes(convertRun(content, getInheritedRunFormatting(content.formatting), styleResolver, textBoxAnchors));
 		else if (content.type === "hyperlink") {
-			const currentHyperlinkIndex = hyperlinkIndex;
-			hyperlinkIndex += 1;
 			const linkNodes = convertHyperlink(content, {
 				getInheritedRunFormatting,
 				styleResolver,
-				hyperlinkIndex: currentHyperlinkIndex,
+				hyperlinkIndex: nextHyperlinkInstanceIndex(),
 				textBoxAnchors
 			});
 			if (linkNodes.length === 0) {
@@ -189,7 +190,7 @@ function convertParagraph(paragraph, styleResolver, activeCommentIds, extraRunFo
 			}
 			emitInlineNodes(linkNodes);
 		} else if (content.type === "simpleField" || content.type === "complexField") emitInlineNode(convertField(content, getInheritedRunFormatting, styleResolver));
-		else if (content.type === "inlineSdt") emitInlineNode(convertInlineSdt(content, getInheritedRunFormatting, styleResolver, textBoxAnchors));
+		else if (content.type === "inlineSdt") emitInlineNode(convertInlineSdt(content, nextHyperlinkInstanceIndex, getInheritedRunFormatting, styleResolver, textBoxAnchors));
 		else if (content.type === "insertion" || content.type === "moveTo") emitTrackedChange(content, "insertion", content.type === "moveTo" ? "moveTo" : null);
 		else if (content.type === "deletion" || content.type === "moveFrom") emitTrackedChange(content, "deletion", content.type === "moveFrom" ? "moveFrom" : null);
 		else if (content.type === "mathEquation") emitInlineNode(convertMathEquation(content));
@@ -216,15 +217,17 @@ const resolveParagraphStyleFontFamily = (styleId, styleResolver) => {
 };
 /**
 * Apply comment marks to PM nodes within a comment range.
-* Only the first active comment ID is used (comments don't overlap visually).
 */
 function applyCommentMarks(nodes, commentIds) {
 	if (commentIds.size === 0) return nodes;
-	const commentId = [...commentIds][0];
-	const commentMark = schema.marks["comment"].create({ commentId });
+	const commentMarkType = schema.marks["comment"];
+	if (!commentMarkType) return nodes;
+	const commentMarks = [...commentIds].toSorted((left, right) => left - right).map((commentId) => commentMarkType.create({ commentId }));
 	return nodes.map((node) => {
-		if (node.isText || node.isInline && node.type.allowsMarkType(commentMark.type)) return node.mark(commentMark.addToSet(node.marks));
-		return node;
+		if (!node.isText && (!node.isInline || !node.type.allowsMarkType(commentMarkType))) return node;
+		let marks = node.marks;
+		for (const commentMark of commentMarks) marks = commentMark.addToSet(marks);
+		return node.mark(marks);
 	});
 }
 function anchorPointComment(nodes, commentId) {
@@ -241,13 +244,11 @@ function anchorPointComment(nodes, commentId) {
 * Convert tracked change (insertion or deletion) content to PM nodes with
 * an insertion/deletion mark applied.
 */
-function convertTrackedChange(change, markType, getInheritedRunFormatting, styleResolver, moveKind = null, textBoxAnchors) {
+function convertTrackedChange(change, markType, nextHyperlinkInstanceIndex, getInheritedRunFormatting, styleResolver, moveKind = null, textBoxAnchors) {
 	const nodes = [];
-	let hyperlinkIndex = 0;
 	for (const item of change.content) if (item.type === "run") nodes.push(...convertRun(item, getInheritedRunFormatting(item.formatting), styleResolver, textBoxAnchors));
 	else {
-		const currentHyperlinkIndex = hyperlinkIndex;
-		hyperlinkIndex += 1;
+		const currentHyperlinkIndex = nextHyperlinkInstanceIndex();
 		nodes.push(...convertHyperlink(item, {
 			getInheritedRunFormatting,
 			styleResolver,
@@ -919,7 +920,8 @@ function standaloneTableCellToProseMirror(cell, nodeType) {
 		styleResolver: null,
 		context: {
 			theme: null,
-			nextTextBoxGroupId: createTextBoxGroupIdFactory()
+			nextTextBoxGroupId: createTextBoxGroupIdFactory(),
+			nextHyperlinkInstanceIndex: createHyperlinkInstanceIndexAllocator()
 		},
 		isHeader: nodeType === "tableHeader",
 		gridWidthPercent: void 0,
@@ -971,20 +973,17 @@ function convertMathEquation(math) {
 /**
 * Convert an InlineSdt to a ProseMirror sdt node with inline content.
 */
-function convertInlineSdt(sdt, getInheritedRunFormatting, styleResolver, textBoxAnchors) {
+function convertInlineSdt(sdt, nextHyperlinkInstanceIndex, getInheritedRunFormatting, styleResolver, textBoxAnchors) {
 	const props = sdt.properties;
 	const inlineNodes = [];
-	let hyperlinkIndex = 0;
 	for (const content of sdt.content) if (content.type === "run") {
 		const runNodes = convertRun(content, getInheritedRunFormatting(content.formatting), styleResolver, textBoxAnchors);
 		inlineNodes.push(...runNodes);
 	} else if (content.type === "hyperlink") {
-		const currentHyperlinkIndex = hyperlinkIndex;
-		hyperlinkIndex += 1;
 		const linkNodes = convertHyperlink(content, {
 			getInheritedRunFormatting,
 			styleResolver,
-			hyperlinkIndex: currentHyperlinkIndex,
+			hyperlinkIndex: nextHyperlinkInstanceIndex(),
 			textBoxAnchors
 		});
 		inlineNodes.push(...linkNodes);
@@ -992,12 +991,12 @@ function convertInlineSdt(sdt, getInheritedRunFormatting, styleResolver, textBox
 		const fieldNode = convertField(content, getInheritedRunFormatting, styleResolver);
 		if (fieldNode) inlineNodes.push(fieldNode);
 	} else if (content.type === "inlineSdt") {
-		const nestedSdt = convertInlineSdt(content, getInheritedRunFormatting, styleResolver, textBoxAnchors);
+		const nestedSdt = convertInlineSdt(content, nextHyperlinkInstanceIndex, getInheritedRunFormatting, styleResolver, textBoxAnchors);
 		if (nestedSdt) inlineNodes.push(nestedSdt);
-	} else if (content.type === "insertion") inlineNodes.push(...convertTrackedChange(content, "insertion", getInheritedRunFormatting, styleResolver, null, textBoxAnchors));
-	else if (content.type === "deletion") inlineNodes.push(...convertTrackedChange(content, "deletion", getInheritedRunFormatting, styleResolver, null, textBoxAnchors));
-	else if (content.type === "moveTo") inlineNodes.push(...convertTrackedChange(content, "insertion", getInheritedRunFormatting, styleResolver, "moveTo", textBoxAnchors));
-	else if (content.type === "moveFrom") inlineNodes.push(...convertTrackedChange(content, "deletion", getInheritedRunFormatting, styleResolver, "moveFrom", textBoxAnchors));
+	} else if (content.type === "insertion") inlineNodes.push(...convertTrackedChange(content, "insertion", nextHyperlinkInstanceIndex, getInheritedRunFormatting, styleResolver, null, textBoxAnchors));
+	else if (content.type === "deletion") inlineNodes.push(...convertTrackedChange(content, "deletion", nextHyperlinkInstanceIndex, getInheritedRunFormatting, styleResolver, null, textBoxAnchors));
+	else if (content.type === "moveTo") inlineNodes.push(...convertTrackedChange(content, "insertion", nextHyperlinkInstanceIndex, getInheritedRunFormatting, styleResolver, "moveTo", textBoxAnchors));
+	else if (content.type === "moveFrom") inlineNodes.push(...convertTrackedChange(content, "deletion", nextHyperlinkInstanceIndex, getInheritedRunFormatting, styleResolver, "moveFrom", textBoxAnchors));
 	else {
 		const mathNode = convertMathEquation(content);
 		if (mathNode) inlineNodes.push(mathNode);
@@ -1378,7 +1377,7 @@ function convertShape(shape) {
 }
 function convertParagraphWithTextBoxes(block, styleResolver, { textBoxGroupId, context, extraRunFormatting, tableParagraphOverlay }) {
 	const { textBoxes, textBoxAnchors } = extractTextBoxesFromParagraph(block, textBoxGroupId);
-	const pmParagraph = convertParagraph(block, styleResolver, void 0, extraRunFormatting, tableParagraphOverlay, textBoxAnchors);
+	const pmParagraph = convertParagraph(block, styleResolver, context.nextHyperlinkInstanceIndex, void 0, extraRunFormatting, tableParagraphOverlay, textBoxAnchors);
 	const nodes = [];
 	const isEmptyAfterExtraction = textBoxes.length > 0 && !hasContentBesidesTextBoxAnchors(pmParagraph);
 	const keepWrapperParagraph = isEmptyAfterExtraction && hasParagraphBoundaryPayload(block, pmParagraph);
@@ -1637,19 +1636,18 @@ function headerFooterToProseDoc(content, options) {
 	const styleResolver = options?.styles ? createStyleEngine(options.styles) : null;
 	const theme = options?.theme ?? null;
 	const nextTextBoxGroupId = createTextBoxGroupIdFactory();
+	const conversionContext = {
+		theme,
+		nextTextBoxGroupId,
+		nextHyperlinkInstanceIndex: createHyperlinkInstanceIndexAllocator()
+	};
 	const convertBlocks = (blocks) => {
 		const out = [];
 		for (const block of blocks) if (block.type === "paragraph") out.push(...convertParagraphWithTextBoxes(block, styleResolver, {
 			textBoxGroupId: nextTextBoxGroupId(),
-			context: {
-				theme,
-				nextTextBoxGroupId
-			}
-		}));
-		else if (block.type === "table") out.push(convertTable(block, styleResolver, {
-			theme,
-			nextTextBoxGroupId
+			context: conversionContext
 		}));
+		else if (block.type === "table") out.push(convertTable(block, styleResolver, conversionContext));
 		else out.push(convertBlockSdt(block, convertBlocks));
 		return out;
 	};

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

@@ -11,6 +11,7 @@ const CommentExtension = createMarkExtension({
 	name: "comment",
 	schemaMarkName: "comment",
 	markSpec: {
+		excludes: "",
 		attrs: { 
 		/** Comment ID (matches Comment.id) */
 commentId: { default: 0 } },

package/dist/utils/paragraphInlineLayout.d.ts

@@ -0,0 +1,14 @@
+import { ParagraphAttrs, ParagraphBlock } from "../layout-engine/types.js";
+//#region src/utils/paragraphInlineLayout.d.ts
+type ParagraphAlignment = NonNullable<ParagraphAttrs["alignment"]>;
+type PhysicalParagraphInlineLayout = {
+  alignment: ParagraphAlignment;
+  explicitAlignment?: ParagraphAlignment;
+  indentLeft: number;
+  indentRight: number;
+  isRtl: boolean;
+};
+/** Resolve logical OOXML paragraph sides into physical inline geometry. */
+declare const resolvePhysicalParagraphInlineLayout: (block: ParagraphBlock) => PhysicalParagraphInlineLayout;
+//#endregion
+export { PhysicalParagraphInlineLayout, resolvePhysicalParagraphInlineLayout };

package/dist/utils/paragraphInlineLayout.js

@@ -0,0 +1,25 @@
+import { isRtlParagraph } from "./paragraphBaseDirection.js";
+//#region src/utils/paragraphInlineLayout.ts
+const mirrorHorizontalAlignment = (alignment) => {
+	if (alignment === "left") return "right";
+	if (alignment === "right") return "left";
+	return alignment;
+};
+/** Resolve logical OOXML paragraph sides into physical inline geometry. */
+const resolvePhysicalParagraphInlineLayout = (block) => {
+	const attrs = block.attrs;
+	const isRtl = isRtlParagraph(block);
+	const mirrorsHorizontalSides = attrs?.bidi === true;
+	const explicitAlignment = mirrorsHorizontalSides ? mirrorHorizontalAlignment(attrs?.alignment) : attrs?.alignment;
+	const indentLeft = attrs?.indent?.left ?? 0;
+	const indentRight = attrs?.indent?.right ?? 0;
+	return {
+		alignment: explicitAlignment ?? (isRtl ? "right" : "left"),
+		...explicitAlignment === void 0 ? {} : { explicitAlignment },
+		indentLeft: mirrorsHorizontalSides ? indentRight : indentLeft,
+		indentRight: mirrorsHorizontalSides ? indentLeft : indentRight,
+		isRtl
+	};
+};
+//#endregion
+export { resolvePhysicalParagraphInlineLayout };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.25.1",
+  "version": "0.25.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",