@stll/folio-core 0.28.1 → 0.30.0

package/dist/prosemirror/plugins/templateDirectives.js

@@ -71,7 +71,7 @@ const scanDirectives = (doc) => {
 			const last = chunks.at(-1);
 			ranges.push({
 				from: chunks[0]?.start ?? 0,
-				to: last ? last.start + last.text.length : 0,
+				to: last ? last.end ?? last.start + last.text.length : 0,
 				kind: sole.meta.kind,
 				expr: directiveExpr(sole.meta),
 				block: true
@@ -82,7 +82,7 @@ const scanDirectives = (doc) => {
 			const clauseVersion = marker.meta.kind === "clause" ? marker.meta.version : void 0;
 			ranges.push({
 				from: offsetToDocPos(chunks, marker.start),
-				to: offsetToDocPos(chunks, marker.end),
+				to: offsetToDocPos(chunks, marker.end, "end"),
 				kind: marker.meta.kind,
 				expr: directiveExpr(marker.meta),
 				block: false,

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

@@ -1,5 +1,5 @@
 import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, LanguageAttrs, RunFormattingOverrideAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs } from "./marks.js";
-import { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, ParagraphPropertyChangeAttrs, SdtAttrs, ShapeAttrs, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAttrs } from "./nodes.js";
+import { BlockSdtAttrs, BookmarkBoundaryAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, ParagraphPropertyChangeAttrs, SdtAttrs, ShapeAttrs, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAttrs } from "./nodes.js";
 import { ExtensionManager } from "../extensions/ExtensionManager.js";
 //#region src/prosemirror/schema/index.d.ts
 declare const singletonManager: ExtensionManager;
@@ -11,4 +11,4 @@ type DocxSchema = typeof schema;
 type DocxNode = ReturnType<typeof schema.node>;
 type DocxMark = ReturnType<typeof schema.mark>;
 //#endregion
-export { type BlockSdtAttrs, type CharacterSpacingAttrs, type CharacterStyleAttrs, type CommentAttrs, DocxMark, DocxNode, DocxSchema, type EmphasisMarkAttrs, type FieldAttrs, type FontFamilyAttrs, type FontSizeAttrs, type FootnoteRefAttrs, type HardBreakAttrs, type HighlightAttrs, type HyperlinkAttrs, type ImageAttrs, type ImagePositionAttrs, type LanguageAttrs, type MathAttrs, type ParagraphAttrs, type ParagraphPropertyChangeAttrs, type RunFormattingOverrideAttrs, type RunPropertyChangeMarkAttrs, type RunShadingAttrs, type SdtAttrs, type ShapeAttrs, type StrikeAttrs, type SymbolAttrs, type TabAttrs, type TableAttrs, type TableCellAttrs, type TableRowAttrs, type TextBoxAttrs, type TextColorAttrs, type TextEffectAttrs, type TrackedChangeMarkAttrs, type UnderlineAttrs, schema, singletonManager };
+export { type BlockSdtAttrs, type BookmarkBoundaryAttrs, type CharacterSpacingAttrs, type CharacterStyleAttrs, type CommentAttrs, DocxMark, DocxNode, DocxSchema, type EmphasisMarkAttrs, type FieldAttrs, type FontFamilyAttrs, type FontSizeAttrs, type FootnoteRefAttrs, type HardBreakAttrs, type HighlightAttrs, type HyperlinkAttrs, type ImageAttrs, type ImagePositionAttrs, type LanguageAttrs, type MathAttrs, type ParagraphAttrs, type ParagraphPropertyChangeAttrs, type RunFormattingOverrideAttrs, type RunPropertyChangeMarkAttrs, type RunShadingAttrs, type SdtAttrs, type ShapeAttrs, type StrikeAttrs, type SymbolAttrs, type TabAttrs, type TableAttrs, type TableCellAttrs, type TableRowAttrs, type TextBoxAttrs, type TextColorAttrs, type TextEffectAttrs, type TrackedChangeMarkAttrs, type UnderlineAttrs, schema, singletonManager };

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

@@ -15,6 +15,16 @@ type SymbolAttrs = {
   font: string;
   char: string;
 };
+type BookmarkBoundaryAttrs = {
+  type: "start";
+  id: number;
+  name: string;
+  colFirst?: number;
+  colLast?: number;
+} | {
+  type: "end";
+  id: number;
+};
 /**
  * Paragraph node attributes - maps to ParagraphFormatting
  */
@@ -292,6 +302,8 @@ type FieldAttrs = {
   instruction: string;
   /** Current/cached display text */
   displayText: string;
+  /** Imported cache that proved numbered REF resolution for this field. */
+  _numberedRefBaseline?: string;
   /** Whether the field came from w:fldSimple or a complex fldChar range */
   fieldKind: "simple" | "complex";
   /** Field is locked */
@@ -559,6 +571,8 @@ type TableAttrs = {
   borders?: document_d_exports.TableBorders;
   /** Effective table indent after style resolution. PM-only; never serialized. */
   _resolvedIndent?: NonNullable<document_d_exports.TableFormatting["indent"]>;
+  /** Style-derived table justification fallback. PM-only; never serialized. */
+  _resolvedJustification?: NonNullable<document_d_exports.TableFormatting["justification"]>;
   /** Effective table direction after style resolution. PM-only; never serialized. */
   _resolvedBidi?: boolean;
   /** Original table formatting from DOCX for lossless round-trip serialization */
@@ -584,6 +598,8 @@ type TableRowAttrs = {
   isHeader?: boolean;
   /** Whether the row is hidden (`w:hidden`) */
   hidden?: boolean;
+  /** Style-derived row justification fallback. PM-only; never serialized. */
+  _resolvedJustification?: NonNullable<document_d_exports.TableRowFormatting["justification"]>;
   /** Original row formatting from DOCX for lossless round-trip serialization */
   _originalFormatting?: document_d_exports.TableRowFormatting;
   /** Tracked row property changes (w:trPrChange) for round-trip + accept/reject */
@@ -706,4 +722,4 @@ type TableCellAttrs = {
   _docxVMergeContinuationCells?: document_d_exports.TableCell[];
 };
 //#endregion
-export { BlockSdtAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, ParagraphPropertyChangeAttrs, SdtAttrs, ShapeAttrs, SuggestedStructuralMarker, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAnchorAttrs, TextBoxAttrs };
+export { BlockSdtAttrs, BookmarkBoundaryAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, ParagraphAttrs, ParagraphPropertyChangeAttrs, SdtAttrs, ShapeAttrs, SuggestedStructuralMarker, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAnchorAttrs, TextBoxAttrs };

package/dist/prosemirror/utils/tabCalculator.d.ts

@@ -1,123 +1,2 @@
-//#region src/prosemirror/utils/tabCalculator.d.ts
-/**
- * Tab Width Calculator
- *
- * Computes tab widths based on position and tab stops.
- * Follows OOXML tab stop semantics:
- * - Default tab interval: 720 twips (0.5 inch, 48px at 96dpi)
- * - Tab stops can be start (left), end (right), center, decimal, or bar
- * - Explicit tab stops override default stops
- *
- * Based on ECMA-376 specification and clean-room understanding of tab layout.
- */
-/**
- * Tab alignment types
- */
-type TabAlignment = "start" | "end" | "center" | "decimal" | "bar" | "clear";
-/**
- * Tab leader (fill character) types
- */
-type TabLeader = "none" | "dot" | "hyphen" | "underscore" | "middleDot" | "heavy";
-/**
- * Tab stop definition
- */
-type TabStop = {
-  /** Tab alignment mode */
-  val: TabAlignment;
-  /** Position in twips from left margin */
-  pos: number;
-  /** Optional leader character */
-  leader?: TabLeader;
-};
-/**
- * Context for tab calculations
- */
-type TabContext = {
-  /** Explicit tab stops from paragraph or style */
-  explicitStops?: TabStop[];
-  /** Default tab interval in twips (default: 720 = 0.5 inch) */
-  defaultTabInterval?: number;
-  /** Left indent in twips */
-  leftIndent?: number;
-};
-/**
- * Result of tab width calculation
- */
-type TabWidthResult = {
-  /** Width of the tab in pixels */
-  width: number;
-  /** Leader character to render (if any) */
-  leader?: TabLeader;
-  /** Alignment that was applied */
-  alignment: TabAlignment | "default";
-};
-/** Default tab interval: 720 twips = 0.5 inch */
-declare const DEFAULT_TAB_INTERVAL_TWIPS = 720;
-/** Twips per inch */
-declare const TWIPS_PER_INCH = 1440;
-/** Pixels per inch (96 dpi standard for CSS) */
-declare const PIXELS_PER_INCH = 96;
-/**
- * Convert twips to pixels
- * @param twips - Value in twips (1/1440 inch)
- * @returns Value in pixels (at 96 dpi)
- */
-declare function twipsToPixels(twips: number): number;
-/**
- * Convert pixels to twips
- * @param pixels - Value in pixels (at 96 dpi)
- * @returns Value in twips (1/1440 inch)
- */
-declare function pixelsToTwips(pixels: number): number;
-/**
- * Compute the list of effective tab stops for a paragraph
- *
- * Merges explicit stops with default stops at regular intervals.
- * Explicit stops before the left indent remain available to a hanging first
- * line. Continuation lines naturally skip them because their cursor already
- * starts at the left indent.
- *
- * @param context - Tab context with explicit stops and settings
- * @returns Sorted array of tab stops in twips
- */
-declare function computeTabStops(context: TabContext): TabStop[];
-/**
- * Pixel widths of the content after a tab, needed to position non-left stops.
- *
- * Caller measures its own runs (the painter and the layout measurer have
- * different run models and measurement paths) and passes the result here, so
- * this module owns the stop grid + alignment math without owning measurement.
- */
-type TabFollowingContent = {
-  /** Total width of the runs after the tab. Used for `end` and `center` stops. */
-  followingWidth?: number;
-  /** Width of the content before the decimal separator. Used for `decimal` stops. */
-  decimalPrefixWidth?: number;
-};
-/**
- * Calculate the width of a tab character.
- *
- * Finds the next tab stop after the current position and computes the width
- * needed to reach it. For `end`/`center`/`decimal` stops the content after the
- * tab is anchored against the stop, so the caller supplies its measured width
- * via {@link TabFollowingContent}.
- *
- * @param currentXPx - Current horizontal position in pixels (from the content
- *   area's left edge — the same origin tab stop positions are measured from)
- * @param context - Tab context with stops and settings
- * @param following - Measured widths of the content after the tab
- * @returns Tab width result with width in pixels
- */
-declare function calculateTabWidth(currentXPx: number, context: TabContext, following?: TabFollowingContent): TabWidthResult;
-/**
- * Calculate tab width with simple default stops
- *
- * Simplified version for basic tab rendering without explicit stops.
- * Uses the default 0.5 inch (48px) tab interval.
- *
- * @param currentXPx - Current horizontal position in pixels
- * @returns Width of the tab in pixels
- */
-declare function calculateSimpleTabWidth(currentXPx: number): number;
-//#endregion
-export { DEFAULT_TAB_INTERVAL_TWIPS, PIXELS_PER_INCH, TWIPS_PER_INCH, TabAlignment, TabContext, TabFollowingContent, TabLeader, TabStop, TabWidthResult, calculateSimpleTabWidth, calculateTabWidth, computeTabStops, pixelsToTwips, twipsToPixels };
+import { DEFAULT_TAB_INTERVAL_TWIPS, PIXELS_PER_INCH, TWIPS_PER_INCH, TabAlignment, TabContext, TabFollowingContent, TabLeader, TabStop, TabWidthResult, calculateSimpleTabWidth, calculateTabWidth, computeTabStops, pixelsToTwips, twipsToPixels } from "../../layout-engine/measure/tabCalculator.js";
+export { DEFAULT_TAB_INTERVAL_TWIPS, PIXELS_PER_INCH, TWIPS_PER_INCH, type TabAlignment, type TabContext, type TabFollowingContent, type TabLeader, type TabStop, type TabWidthResult, calculateSimpleTabWidth, calculateTabWidth, computeTabStops, pixelsToTwips, twipsToPixels };

package/dist/prosemirror/utils/tabCalculator.js

@@ -1,141 +1,2 @@
-//#region src/prosemirror/utils/tabCalculator.ts
-/** Default tab interval: 720 twips = 0.5 inch */
-const DEFAULT_TAB_INTERVAL_TWIPS = 720;
-/** Twips per inch */
-const TWIPS_PER_INCH = 1440;
-/** Pixels per inch (96 dpi standard for CSS) */
-const PIXELS_PER_INCH = 96;
-/** Ignore sub-twip round trips when the cursor already occupies a tab stop. */
-const TAB_POSITION_EPSILON_TWIPS = .01;
-/**
-* Convert twips to pixels
-* @param twips - Value in twips (1/1440 inch)
-* @returns Value in pixels (at 96 dpi)
-*/
-function twipsToPixels(twips) {
-	return twips / TWIPS_PER_INCH * 96;
-}
-/**
-* Convert pixels to twips
-* @param pixels - Value in pixels (at 96 dpi)
-* @returns Value in twips (1/1440 inch)
-*/
-function pixelsToTwips(pixels) {
-	return pixels / 96 * TWIPS_PER_INCH;
-}
-/**
-* Compute the list of effective tab stops for a paragraph
-*
-* Merges explicit stops with default stops at regular intervals.
-* Explicit stops before the left indent remain available to a hanging first
-* line. Continuation lines naturally skip them because their cursor already
-* starts at the left indent.
-*
-* @param context - Tab context with explicit stops and settings
-* @returns Sorted array of tab stops in twips
-*/
-function computeTabStops(context) {
-	const { explicitStops = [], defaultTabInterval = 720, leftIndent = 0 } = context;
-	const validExplicitStops = explicitStops.filter((stop) => stop.val !== "clear" && stop.val !== "bar");
-	const clearPositions = explicitStops.filter((stop) => stop.val === "clear").map((stop) => stop.pos);
-	let maxExplicit = 0;
-	for (const stop of validExplicitStops) maxExplicit = Math.max(maxExplicit, stop.pos);
-	const stops = explicitStops.filter((stop) => stop.val !== "clear");
-	const hasLeftIndentClear = clearPositions.some((p) => Math.abs(p - leftIndent) < 20);
-	const addsImplicitLeftIndent = leftIndent > 0 && !hasLeftIndentClear && !validExplicitStops.some((stop) => stop.pos <= leftIndent);
-	if (addsImplicitLeftIndent) stops.push({
-		val: "start",
-		pos: leftIndent,
-		leader: "none"
-	});
-	let pos = Math.floor(Math.max(maxExplicit, leftIndent) / defaultTabInterval) * defaultTabInterval;
-	const limitPos = leftIndent + 14400;
-	while (pos < limitPos) {
-		pos += defaultTabInterval;
-		let hasExplicitStop = false;
-		for (const stop of stops) if (Math.abs(stop.pos - pos) < 20) {
-			hasExplicitStop = true;
-			break;
-		}
-		let hasClearStop = false;
-		for (const clearPos of clearPositions) if (Math.abs(clearPos - pos) < 20) {
-			hasClearStop = true;
-			break;
-		}
-		const isAtLeftIndent = addsImplicitLeftIndent && Math.abs(pos - leftIndent) < 20;
-		if (!hasExplicitStop && !hasClearStop && !isAtLeftIndent) stops.push({
-			val: "start",
-			pos,
-			leader: "none"
-		});
-	}
-	return stops.toSorted((a, b) => a.pos - b.pos);
-}
-/**
-* Calculate the width of a tab character.
-*
-* Finds the next tab stop after the current position and computes the width
-* needed to reach it. For `end`/`center`/`decimal` stops the content after the
-* tab is anchored against the stop, so the caller supplies its measured width
-* via {@link TabFollowingContent}.
-*
-* @param currentXPx - Current horizontal position in pixels (from the content
-*   area's left edge — the same origin tab stop positions are measured from)
-* @param context - Tab context with stops and settings
-* @param following - Measured widths of the content after the tab
-* @returns Tab width result with width in pixels
-*/
-function calculateTabWidth(currentXPx, context, following = {}) {
-	const { defaultTabInterval = 720 } = context;
-	const currentXTwips = pixelsToTwips(currentXPx);
-	const nextStop = computeTabStops(context).find((stop) => stop.pos > currentXTwips + TAB_POSITION_EPSILON_TWIPS);
-	if (!nextStop) {
-		const defaultTabPx = twipsToPixels(defaultTabInterval);
-		let tabWidth = defaultTabPx - currentXPx % defaultTabPx;
-		if (tabWidth <= 0) tabWidth = defaultTabPx;
-		return {
-			width: tabWidth,
-			alignment: "default"
-		};
-	}
-	let width = twipsToPixels(nextStop.pos) - currentXPx;
-	if (nextStop.val === "center") width -= (following.followingWidth ?? 0) / 2;
-	else if (nextStop.val === "end") width -= following.followingWidth ?? 0;
-	else if (nextStop.val === "decimal") width -= following.decimalPrefixWidth ?? 0;
-	else if (nextStop.val === "bar") return {
-		width: 0,
-		...nextStop.leader !== void 0 ? { leader: nextStop.leader } : {},
-		alignment: "bar"
-	};
-	if (width <= 0) {
-		const defaultTabPx = twipsToPixels(defaultTabInterval);
-		let fallbackWidth = defaultTabPx - currentXPx % defaultTabPx;
-		if (fallbackWidth <= 0) fallbackWidth = defaultTabPx;
-		return {
-			width: fallbackWidth,
-			alignment: "default"
-		};
-	}
-	return {
-		width,
-		...nextStop.leader !== void 0 ? { leader: nextStop.leader } : {},
-		alignment: nextStop.val
-	};
-}
-/**
-* Calculate tab width with simple default stops
-*
-* Simplified version for basic tab rendering without explicit stops.
-* Uses the default 0.5 inch (48px) tab interval.
-*
-* @param currentXPx - Current horizontal position in pixels
-* @returns Width of the tab in pixels
-*/
-function calculateSimpleTabWidth(currentXPx) {
-	const defaultTabPx = twipsToPixels(720);
-	let tabWidth = defaultTabPx - currentXPx % defaultTabPx;
-	if (tabWidth < defaultTabPx / 4) tabWidth += defaultTabPx;
-	return tabWidth;
-}
-//#endregion
+import { DEFAULT_TAB_INTERVAL_TWIPS, PIXELS_PER_INCH, TWIPS_PER_INCH, calculateSimpleTabWidth, calculateTabWidth, computeTabStops, pixelsToTwips, twipsToPixels } from "../../layout-engine/measure/tabCalculator.js";
 export { DEFAULT_TAB_INTERVAL_TWIPS, PIXELS_PER_INCH, TWIPS_PER_INCH, calculateSimpleTabWidth, calculateTabWidth, computeTabStops, pixelsToTwips, twipsToPixels };

package/dist/prosemirror/validation.js

@@ -1,4 +1,5 @@
 import { readBlockSdtAttrs, readCharacterSpacingMarkAttrs, readCharacterStyleMarkAttrs, readCommentMarkAttrs, readEmphasisMarkAttrs, readFieldAttrs, readFontFamilyMarkAttrs, readFontSizeMarkAttrs, readFootnoteRefMarkAttrs, readHardBreakAttrs, readHighlightMarkAttrs, readHyperlinkMarkAttrs, readImageAttrs, readLanguageMarkAttrs, readMathAttrs, readParagraphAttrs, readRunFormattingOverrideMarkAttrs, readRunPropertyChangeMarkAttrs, readRunShadingMarkAttrs, readSdtAttrs, readShapeAttrs, readStrikeMarkAttrs, readSymbolAttrs, readTabAttrs, readTableAttrs, readTableCellAttrs, readTableRowAttrs, readTextBoxAttrs, readTextColorMarkAttrs, readTextEffectMarkAttrs, readTrackedChangeMarkAttrs, readUnderlineMarkAttrs } from "./attrs/index.js";
+import { readBookmarkBoundaryAttrs } from "./bookmarkBoundaryAttrs.js";
 import { readTextBoxAnchorAttrs } from "./textBoxAnchorAttrs.js";
 //#region src/prosemirror/validation.ts
 var ProseMirrorDocumentValidationError = class extends Error {
@@ -18,11 +19,71 @@ const validateProseMirrorDocument = (doc) => {
 		message: `Expected doc, got ${doc.type.name}.`
 	});
 	validateNode(doc, "doc", issues);
+	validateBookmarkBoundaryStructure(doc, issues);
 	return {
 		valid: issues.length === 0,
 		issues
 	};
 };
+const validateBookmarkBoundaryStructure = (doc, issues) => {
+	const open = /* @__PURE__ */ new Map();
+	const startedIds = /* @__PURE__ */ new Set();
+	const registerStart = (id, path) => {
+		if (startedIds.has(id)) {
+			issues.push({
+				path,
+				message: `Bookmark id ${id} has more than one start boundary.`
+			});
+			return;
+		}
+		startedIds.add(id);
+		open.set(id, {
+			id,
+			path
+		});
+	};
+	const registerEnd = (id, path) => {
+		if (!open.get(id)) {
+			issues.push({
+				path,
+				message: `Bookmark id ${id} has no open start boundary.`
+			});
+			return;
+		}
+		open.delete(id);
+	};
+	const visit = (node, path) => {
+		const paragraphAttrs = node.type.name === "paragraph" ? readParagraphAttrs(node) : null;
+		if (paragraphAttrs?.ok) for (const [index, bookmark] of (paragraphAttrs.value.bookmarks ?? []).entries()) registerStart(bookmark.id, `${path}.paragraph.attrs.bookmarks[${index}]`);
+		if (node.type.name === "bookmarkBoundary") {
+			const result = readBookmarkBoundaryAttrs(node);
+			if (result.ok) {
+				const attrs = result.value;
+				const hasHyperlink = node.marks.some((mark) => mark.type.name === "hyperlink");
+				const trackedChanges = node.marks.filter((mark) => mark.type.name === "insertion" || mark.type.name === "deletion");
+				if (trackedChanges.length > 1) issues.push({
+					path,
+					message: "Bookmark boundaries cannot carry multiple tracked-change parents."
+				});
+				else if (trackedChanges.length === 1 && !hasHyperlink) issues.push({
+					path,
+					message: "Bookmark boundaries inside tracked changes require a hyperlink serialization parent."
+				});
+				if (attrs.type === "start") registerStart(attrs.id, path);
+				else registerEnd(attrs.id, path);
+			}
+		}
+		node.forEach((child, _offset, index) => {
+			visit(child, `${path}.content[${index}]`);
+		});
+		if (paragraphAttrs?.ok) for (const [index, bookmark] of (paragraphAttrs.value.bookmarks ?? []).entries()) registerEnd(bookmark.id, `${path}.paragraph.attrs.bookmarks[${index}]`);
+	};
+	visit(doc, "doc");
+	for (const boundary of open.values()) issues.push({
+		path: boundary.path,
+		message: `Bookmark id ${boundary.id} has no matching end boundary.`
+	});
+};
 const assertValidProseMirrorDocument = (doc, context) => {
 	if (validDocumentCache.has(doc)) return;
 	const validation = validateProseMirrorDocument(doc);
@@ -50,6 +111,9 @@ const validateNodeAttrs = (node, path, issues) => {
 		case "horizontalRule":
 		case "pageBreak":
 		case "renderedPageBreak": return;
+		case "bookmarkBoundary":
+			appendAttrIssues(path, readBookmarkBoundaryAttrs(node), issues);
+			return;
 		case "tab":
 			appendAttrIssues(path, readTabAttrs(node), issues);
 			return;
@@ -77,6 +141,35 @@ const validateNodeAttrs = (node, path, issues) => {
 			return;
 		case "field":
 			appendAttrIssues(path, readFieldAttrs(node), issues);
+			if (node.childCount > 0) issues.push({
+				path: `${path}.content`,
+				message: "Ordinary fields cannot contain structured result children."
+			});
+			return;
+		case "structuredField":
+			{
+				const fieldAttrs = readFieldAttrs(node);
+				appendAttrIssues(path, fieldAttrs, issues);
+				if (fieldAttrs.ok) {
+					const hasStructuredHyperlink = node.content.content.some((child) => child.marks.some((mark) => mark.type.name === "hyperlink"));
+					if (fieldAttrs.value.fieldKind === "complex") issues.push({
+						path: `${path}.content`,
+						message: "Complex fields cannot contain structured result children."
+					});
+					else if (!hasStructuredHyperlink) issues.push({
+						path: `${path}.content`,
+						message: "Structured simple fields require hyperlink content."
+					});
+					node.forEach((child, _offset, index) => {
+						const childPath = `${path}.content[${index}]`;
+						const hasHyperlink = child.marks.some((mark) => mark.type.name === "hyperlink");
+						if (child.type.name === "bookmarkBoundary" && !hasHyperlink) issues.push({
+							path: childPath,
+							message: "Bookmark boundaries inside fields require a hyperlink parent."
+						});
+					});
+				}
+			}
 			return;
 		case "math":
 			appendAttrIssues(path, readMathAttrs(node), issues);

package/dist/render-dom/RemoteSelectionOverlay.d.ts

@@ -1,9 +1,9 @@
-import { HiddenProseMirrorRemoteSelection } from "../controller/hiddenEditorManager.js";
+import { RemoteSelection } from "../types/remote-selection.js";
 import { RenderedDomContext, RenderedDomPoint, RenderedDomRect } from "./RenderedDomContext.js";
 //#region src/render-dom/RemoteSelectionOverlay.d.ts
 type SyncRemoteSelectionOverlayOptions = {
   pagesContainer: HTMLElement;
-  selections: readonly HiddenProseMirrorRemoteSelection[];
+  selections: readonly RemoteSelection[];
   zoom: number;
   zIndex?: number;
   renderedDomContext?: RenderedDomContext;
@@ -11,9 +11,9 @@ type SyncRemoteSelectionOverlayOptions = {
 type RemoteSelectionOverlayGeometry = {
   caret: RenderedDomPoint | null;
   rects: RenderedDomRect[];
-  selection: HiddenProseMirrorRemoteSelection;
+  selection: RemoteSelection;
 };
-declare const resolveRemoteSelectionOverlayGeometry: (renderedDomContext: RenderedDomContext, selections: readonly HiddenProseMirrorRemoteSelection[]) => RemoteSelectionOverlayGeometry[];
+declare const resolveRemoteSelectionOverlayGeometry: (renderedDomContext: RenderedDomContext, selections: readonly RemoteSelection[]) => RemoteSelectionOverlayGeometry[];
 /** Paint collaborative cursors and selections over the rendered page DOM. */
 declare class RemoteSelectionOverlay {
   clear(pagesContainer: HTMLElement): void;

package/dist/types/documentEnumValues.d.ts

@@ -1,4 +1,7 @@
+import { document_d_exports } from "./document.js";
 //#region src/types/documentEnumValues.d.ts
+declare const SHAPE_TEXT_ANCHOR_VALUES: readonly ["top", "middle", "bottom", "distributed", "justified"];
+declare const normalizeShapeTextAnchor: (value: unknown) => document_d_exports.ShapeTextBody["anchor"] | undefined;
 declare const THEME_COLOR_SLOT_VALUES: readonly ["dk1", "lt1", "dk2", "lt2", "accent1", "accent2", "accent3", "accent4", "accent5", "accent6", "hlink", "folHlink", "background1", "text1", "background2", "text2"];
 declare const BORDER_STYLE_VALUES: readonly ["none", "single", "double", "dotted", "dashed", "thick", "triple", "thinThickSmallGap", "thickThinSmallGap", "thinThickMediumGap", "thickThinMediumGap", "thinThickLargeGap", "thickThinLargeGap", "wave", "doubleWave", "dashSmallGap", "dashDotStroked", "threeDEmboss", "threeDEngrave", "outset", "inset", "nil"];
 declare const UNDERLINE_STYLE_VALUES: readonly ["none", "single", "words", "double", "thick", "dotted", "dottedHeavy", "dash", "dashedHeavy", "dashLong", "dashLongHeavy", "dotDash", "dashDotHeavy", "dotDotDash", "dashDotDotHeavy", "wave", "wavyHeavy", "wavyDouble"];
@@ -90,4 +93,4 @@ type OutlineStyleAttr = (typeof OUTLINE_STYLE_ATTR_VALUES)[number];
 declare const NUMBER_FORMAT_VALUES: readonly ["decimal", "upperRoman", "lowerRoman", "upperLetter", "lowerLetter", "ordinal", "cardinalText", "ordinalText", "hex", "chicago", "ideographDigital", "japaneseCounting", "aiueo", "iroha", "decimalFullWidth", "decimalHalfWidth", "japaneseLegal", "japaneseDigitalTenThousand", "decimalEnclosedCircle", "decimalFullWidth2", "aiueoFullWidth", "irohaFullWidth", "decimalZero", "decimalZero3", "decimalZero4", "decimalZero5", "bullet", "ganada", "chosung", "decimalEnclosedFullstop", "decimalEnclosedParen", "decimalEnclosedCircleChinese", "ideographEnclosedCircle", "ideographTraditional", "ideographZodiac", "ideographZodiacTraditional", "taiwaneseCounting", "ideographLegalTraditional", "taiwaneseCountingThousand", "taiwaneseDigital", "chineseCounting", "chineseLegalSimplified", "chineseCountingThousand", "koreanDigital", "koreanCounting", "koreanLegal", "koreanDigital2", "vietnameseCounting", "russianLower", "russianUpper", "none", "numberInDash", "hebrew1", "hebrew2", "arabicAlpha", "arabicAbjad", "hindiVowels", "hindiConsonants", "hindiNumbers", "hindiCounting", "thaiLetters", "thaiNumbers", "thaiCounting"];
 declare const LEVEL_SUFFIX_VALUES: readonly ["tab", "space", "nothing"];
 //#endregion
-export { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, OutlineStyleAttr, OutlineStyleCssAlias, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES };
+export { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, OutlineStyleAttr, OutlineStyleCssAlias, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TEXT_ANCHOR_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES, normalizeShapeTextAnchor };

package/dist/types/documentEnumValues.js

@@ -1,4 +1,15 @@
 //#region src/types/documentEnumValues.ts
+const SHAPE_TEXT_ANCHOR_VALUES = [
+	"top",
+	"middle",
+	"bottom",
+	"distributed",
+	"justified"
+];
+const normalizeShapeTextAnchor = (value) => {
+	if (value === "center") return "middle";
+	for (const anchor of SHAPE_TEXT_ANCHOR_VALUES) if (value === anchor) return anchor;
+};
 const THEME_COLOR_SLOT_VALUES = [
 	"dk1",
 	"lt1",
@@ -708,4 +719,4 @@ const LEVEL_SUFFIX_VALUES = [
 	"nothing"
 ];
 //#endregion
-export { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES };
+export { BORDER_STYLE_VALUES, CONDITIONAL_STYLE_TYPE_VALUES, EMPHASIS_MARK_VALUES, FIELD_TYPE_VALUES, FLOATING_TABLE_X_SPEC_VALUES, FLOATING_TABLE_Y_SPEC_VALUES, FONT_HINT_VALUES, FONT_THEME_VALUES, FRAME_WRAP_VALUES, FRAME_X_ALIGN_VALUES, FRAME_Y_ALIGN_VALUES, HIGHLIGHT_COLOR_VALUES, IMAGE_HORIZONTAL_ALIGNMENT_VALUES, IMAGE_HORIZONTAL_RELATIVE_TO_VALUES, IMAGE_VERTICAL_ALIGNMENT_VALUES, IMAGE_VERTICAL_RELATIVE_TO_VALUES, IMAGE_WRAP_TEXT_VALUES, IMAGE_WRAP_TYPE_VALUES, LEVEL_SUFFIX_VALUES, LINE_SPACING_RULE_VALUES, NUMBER_FORMAT_VALUES, OUTLINE_STYLE_ATTR_VALUES, OUTLINE_STYLE_CSS_ALIASES, OUTLINE_STYLE_CSS_ALIAS_VALUES, PARAGRAPH_ALIGNMENT_VALUES, POSITIONAL_TAB_ALIGNMENT_VALUES, POSITIONAL_TAB_LEADER_VALUES, POSITIONAL_TAB_RELATIVE_TO_VALUES, SDT_LOCK_VALUES, SDT_TYPE_VALUES, SHADING_PATTERN_VALUES, SHAPE_OUTLINE_STYLE_VALUES, SHAPE_TEXT_ANCHOR_VALUES, SHAPE_TYPE_VALUES, STYLE_TYPE_VALUES, TABLE_CELL_TEXT_DIRECTION_VALUES, TABLE_CELL_VERTICAL_ALIGNMENT_VALUES, TABLE_JUSTIFICATION_VALUES, TABLE_ROW_HEIGHT_RULE_VALUES, TABLE_WIDTH_TYPE_VALUES, TAB_LEADER_VALUES, TAB_STOP_ALIGNMENT_VALUES, TEXT_EFFECT_VALUES, THEME_COLOR_SLOT_VALUES, UNDERLINE_STYLE_VALUES, normalizeShapeTextAnchor };

package/dist/types/editor-story.d.ts

@@ -0,0 +1,8 @@
+//#region src/types/editor-story.d.ts
+/** A secondary note story address, independent of any mounted editor view. */
+type NoteStoryKey = {
+  kind: "footnote" | "endnote";
+  noteId: number;
+};
+//#endregion
+export { NoteStoryKey };

package/dist/types/remote-selection.d.ts

@@ -0,0 +1,11 @@
+//#region src/types/remote-selection.d.ts
+/** Serializable collaborator selection projected into ProseMirror positions. */
+type RemoteSelection = {
+  anchor: number;
+  clientId: number;
+  color: string;
+  head: number;
+  name: string;
+};
+//#endregion
+export { RemoteSelection };

package/dist/types/wrap.d.ts

@@ -0,0 +1,36 @@
+//#region src/types/wrap.d.ts
+/**
+ * Wrap-type predicates shared across the layout pipeline.
+ *
+ * Mirrors eigenpal docx-editor `wrapTypes` so that the new textBoxFlow
+ * predicates (eigenpal #474) and the existing image classifiers agree on
+ * which OOXML wrap variants are floating, which paint over body text, and
+ * which wrap around it.
+ */
+/**
+ * OOXML text-wrap variants for a drawing anchor (`wp:inline` vs the
+ * `wp:wrap*` elements). `inline` keeps the object in the text run; every other
+ * variant takes it out of inline flow. Mirrors the eigenpal docx-editor union
+ * so adapters share one wrap vocabulary.
+ */
+type WrapType = "inline" | "square" | "tight" | "through" | "topAndBottom" | "behind" | "inFront";
+/**
+ * `true` for any wrap type that takes the object out of inline flow.
+ * Includes `topAndBottom` and the wrapNone variants (`behind`/`inFront`):
+ * those are anchored at absolute coordinates even though they don't shrink
+ * line widths.
+ */
+declare function isFloatingWrapType(wrapType: string | undefined): boolean;
+/**
+ * `true` for `behind` and `inFront` — wrapNone variants that don't shrink
+ * line widths; text paints over or under the object.
+ */
+declare function isWrapNone(wrapType: string | undefined): boolean;
+/**
+ * `true` for wrap types that actually divert lines around the object
+ * (`square` / `tight` / `through`). Excludes `topAndBottom` (block flow)
+ * and the wrapNone variants.
+ */
+declare function wrapsAroundText(wrapType: string | undefined): boolean;
+//#endregion
+export { WrapType, isFloatingWrapType, isWrapNone, wrapsAroundText };

package/dist/types/wrap.js

@@ -0,0 +1,40 @@
+//#region src/types/wrap.ts
+const FLOATING_WRAP_TYPES = /* @__PURE__ */ new Set([
+	"square",
+	"tight",
+	"through",
+	"topAndBottom",
+	"behind",
+	"inFront"
+]);
+const TEXT_WRAPPING_TYPES = /* @__PURE__ */ new Set([
+	"square",
+	"tight",
+	"through"
+]);
+/**
+* `true` for any wrap type that takes the object out of inline flow.
+* Includes `topAndBottom` and the wrapNone variants (`behind`/`inFront`):
+* those are anchored at absolute coordinates even though they don't shrink
+* line widths.
+*/
+function isFloatingWrapType(wrapType) {
+	return wrapType !== void 0 && FLOATING_WRAP_TYPES.has(wrapType);
+}
+/**
+* `true` for `behind` and `inFront` — wrapNone variants that don't shrink
+* line widths; text paints over or under the object.
+*/
+function isWrapNone(wrapType) {
+	return wrapType === "behind" || wrapType === "inFront";
+}
+/**
+* `true` for wrap types that actually divert lines around the object
+* (`square` / `tight` / `through`). Excludes `topAndBottom` (block flow)
+* and the wrapNone variants.
+*/
+function wrapsAroundText(wrapType) {
+	return wrapType !== void 0 && TEXT_WRAPPING_TYPES.has(wrapType);
+}
+//#endregion
+export { isFloatingWrapType, isWrapNone, wrapsAroundText };

package/dist/utils/fontResolver.d.ts

@@ -47,7 +47,7 @@ declare const CJK_FALLBACK_FONT_FAMILY = "MS Mincho";
 declare const setGoogleFontsEnabled: (enabled: boolean) => void;
 declare const getGoogleFontsEnabled: () => boolean;
 declare const setEmbeddedFontFamilyMap: (map: ReadonlyMap<string, string> | null) => void;
-declare function resolveFontFamily(docxFontName: string): ResolvedFont;
+declare function resolveFontFamily(docxFontName: string, alternateFontName?: string): ResolvedFont;
 /**
  * Split a CSS `font-family` list built by `quoteFontName` back into family
  * names: the inverse of the quoting and escaping applied there. Quoted entries