@stll/folio-core 0.56.0 → 0.57.0

package/dist/controller/hiddenEditorManager.js

@@ -10,20 +10,25 @@ import { ensureBaseDirectionInState } from "../prosemirror/extensions/features/A
 import { ensureParaIdsInDoc, ensureParaIdsInState } from "../prosemirror/extensions/features/ParaIdAllocatorExtension.js";
 import { createParagraphChangeTrackerPlugin, markPackageChange } from "../prosemirror/extensions/features/ParagraphChangeTrackerExtension.js";
 import { toggleMarkForAllScripts, toggleUnderlineMark } from "../prosemirror/extensions/marks/markUtils.js";
+import { HyperlinkRemovalRefusal } from "../prosemirror/hyperlinkRemoval.js";
+import { markNoteReferenceReplay, noteReferenceTransactionIssue } from "../prosemirror/noteReferenceOccurrences.js";
 import { createDocumentNumberingPlugin } from "../prosemirror/plugins/documentNumbering.js";
-import { createDocumentStylesPlugin } from "../prosemirror/plugins/documentStyles.js";
+import { createDocumentStyleContextPlugin, createDocumentStylesPlugin } from "../prosemirror/plugins/documentStyles.js";
 import { schema } from "../prosemirror/schema/index.js";
 import { createTextInputPlugin } from "../prosemirror/textInput.js";
 import { applyAttrSchemaMigrations, proseDocumentParagraphSourceContract, readYjsAttrSchemaVersion, readYjsParagraphSourceContract, withParagraphSourceContract, writeYjsDocumentMetadata } from "../prosemirror/yjsDocumentMetadata.js";
 import { CANONICAL_GAP, usesCanonicalSession } from "../types/canonicalCapabilities.js";
 import { prepareCanonicalPaste } from "./canonicalClipboard.js";
+import { canonicalCommentBody, compileCanonicalComments } from "./canonicalComments.js";
 import { createCanonicalInputBoundary } from "./canonicalInput.js";
+import { createCanonicalSectionPropertiesOperation } from "./canonicalOperations.js";
 import { CanonicalPublicOperations } from "./canonicalPublicOperations.js";
+import { restoreCanonicalSelection } from "./canonicalSelection.js";
 import { createCanonicalSession, publishCanonicalProjection } from "./canonicalSession.js";
 import { prepareCanonicalAutoformat, prepareCanonicalCommands } from "./canonicalStructure.js";
 import { createHiddenEditorApi } from "./hiddenEditorApi.js";
 import { Result, TaggedError, panic } from "better-result";
-import { OP_STORIES } from "@stll/docx-core/ops";
+import { OP_STORIES, freshCommentId } from "@stll/docx-core/ops";
 import { EditorState, Plugin } from "prosemirror-state";
 import { EditorView } from "prosemirror-view";
 //#region src/controller/hiddenEditorManager.ts
@@ -206,6 +211,7 @@ const createHiddenEditorManager = (deps) => {
 	let view = null;
 	let releaseCommandOwner;
 	let editorSession = { type: "prosemirror" };
+	let canonicalSessionEpoch = 0;
 	let modeOverride = null;
 	const syncCanonicalMode = () => {
 		if (editorSession.type !== "canonical") return;
@@ -253,6 +259,7 @@ const createHiddenEditorManager = (deps) => {
 			type: "canonical",
 			session: result.value
 		};
+		canonicalSessionEpoch += 1;
 		modeOverride = null;
 		syncCanonicalMode();
 		return true;
@@ -261,7 +268,7 @@ const createHiddenEditorManager = (deps) => {
 		doc: session.projection.doc,
 		plugins: [
 			createParagraphChangeTrackerPlugin(),
-			createDocumentStylesPlugin(deps.getStyles() ?? session.document.package.styles),
+			createDocumentStyleContextPlugin(deps.getStyles() ?? session.document.package.styles),
 			createDocumentNumberingPlugin(session.document.package.numbering),
 			...[...deps.getExtensionManager()?.getPlugins() ?? [], ...deps.getExternalPlugins()].flatMap(({ props }) => props.transformPastedHTML === void 0 && props.transformPasted === void 0 && props.transformCopied === void 0 && props.clipboardTextSerializer === void 0 ? [] : [new Plugin({ props: {
 				...props.transformCopied === void 0 ? {} : { transformCopied: props.transformCopied },
@@ -271,7 +278,7 @@ const createHiddenEditorManager = (deps) => {
 			} })])
 		]
 	});
-	const publishCommit = (commit) => {
+	const publishCommit = (commit, reportRefusal = refuse) => {
 		if (!view || deps.getReadOnly() || editorSession.type !== "canonical") return false;
 		const session = editorSession.session;
 		const result = publishCanonicalProjection({
@@ -280,7 +287,7 @@ const createHiddenEditorManager = (deps) => {
 			session
 		});
 		if (result.isErr()) {
-			refuse(result.error.message, result.error.gap);
+			reportRefusal(result.error.message, result.error.gap);
 			return false;
 		}
 		const staged = result.value;
@@ -312,7 +319,21 @@ const createHiddenEditorManager = (deps) => {
 			refuse("Composition must finish before formatting.");
 			return false;
 		}
-		const intents = getCanonicalCommandIntents(command, view.state);
+		const commandState = view.state;
+		const described = Result.try({
+			try: () => getCanonicalCommandIntents(command, commandState),
+			catch: (error) => error
+		});
+		if (described.isErr()) {
+			if (!(described.error instanceof HyperlinkRemovalRefusal)) throw described.error;
+			const refusal = new CanonicalSessionRefusalError({
+				gap: CANONICAL_GAP.commands,
+				message: described.error.message
+			});
+			refuse(refusal.message, refusal.gap);
+			return false;
+		}
+		const intents = described.value;
 		if (intents === void 0) return void 0;
 		syncCanonicalMode();
 		editorSession.session.breakUndoGroup();
@@ -568,7 +589,11 @@ const createHiddenEditorManager = (deps) => {
 					lastInputRule = void 0;
 					editorSession.session.breakUndoGroup();
 				}
+				const modules = deps.getCollaborationModules();
+				if (modules && transaction.getMeta(modules.yProseMirror.ySyncPluginKey) !== void 0) markNoteReferenceReplay(transaction);
 				const applied = view.state.applyTransaction(transaction);
+				const noteIssue = noteReferenceTransactionIssue(transaction);
+				if (noteIssue) deps.onSessionRefusal?.(noteIssue.message, CANONICAL_GAP.dispatch, noteIssue);
 				if (editorSession.type === "canonical" && !applied.state.doc.eq(view.state.doc)) {
 					refuse("A plugin attempted an unclassified canonical document mutation.");
 					return;
@@ -751,14 +776,15 @@ const createHiddenEditorManager = (deps) => {
 	};
 	const syncExternalDocument = () => {
 		if (!view || isDestroying) return;
+		const canonicalRequested = usesCanonicalSession(deps.getExperimentalSession?.(), CANONICAL_GAP.authorityRouting);
 		const collaboration = deps.getCollaboration();
 		const collaborationModules = deps.getCollaborationModules();
-		if (collaboration && !collaborationModules && !usesCanonicalSession(deps.getExperimentalSession?.(), CANONICAL_GAP.authorityRouting)) return;
+		if (collaboration && !collaborationModules && !canonicalRequested) return;
 		const document = deps.getDocument();
 		const currentDocId = deps.getDocumentIdentity();
 		const currentCollaborationFragment = collaboration?.yXmlFragment ?? null;
 		const collaborationSourceChanged = currentCollaborationFragment !== lastCollaborationFragment;
-		const sessionChanged = editorSession.type !== "prosemirror" !== usesCanonicalSession(deps.getExperimentalSession?.(), CANONICAL_GAP.authorityRouting);
+		const sessionChanged = editorSession.type !== "prosemirror" !== canonicalRequested;
 		if (collaboration && !collaborationSourceChanged && !sessionChanged) return;
 		if (isInitialized && currentDocId === lastDocumentId && !collaborationSourceChanged && !sessionChanged) return;
 		input.reset();
@@ -790,13 +816,20 @@ const createHiddenEditorManager = (deps) => {
 	};
 	const publishStoryCommit = (storyView, commit) => {
 		if (!view || editorSession.type !== "canonical") return false;
-		if (deps.getEditingMode?.() === "suggesting") {
-			refuse("Suggesting is unavailable in the experimental canonical session.", CANONICAL_GAP.suggesting);
-			return false;
-		}
 		const session = editorSession.session;
 		const bodyTransaction = view.state.tr;
 		if (!bodyTransaction.doc.eq(commit.bodyProjection.doc)) bodyTransaction.replaceWith(0, bodyTransaction.doc.content.size, commit.bodyProjection.doc.content);
+		if (commit.selection.anchor.story === OP_STORIES.MAIN && commit.selection.head.story === OP_STORIES.MAIN) {
+			if (!restoreCanonicalSelection({
+				transaction: bodyTransaction,
+				projection: commit.bodyProjection,
+				selection: commit.selection,
+				unavailable: { type: "refuse" }
+			})) {
+				refuse("The canonical body history selection is unavailable.");
+				return false;
+			}
+		}
 		markPackageChange(bodyTransaction);
 		bodyTransaction.setMeta("addToHistory", false);
 		const bodyStaged = Result.try(() => view?.state.applyTransaction(bodyTransaction));
@@ -839,6 +872,7 @@ const createHiddenEditorManager = (deps) => {
 		};
 		return executor;
 	};
+	const isCanonicalModelSessionRequested = () => usesCanonicalSession(deps.getExperimentalSession?.(), CANONICAL_GAP.authorityRouting);
 	return {
 		ensureView,
 		retryViewCreation,
@@ -851,6 +885,8 @@ const createHiddenEditorManager = (deps) => {
 		api: createHiddenEditorApi({
 			getView: () => view,
 			getDocumentContext: () => editorSession.type === "refused" ? null : deps.getDocumentContext(),
+			getCanonicalComments: () => editorSession.type === "canonical" ? editorSession.session.getCommittedComments() : null,
+			getCanonicalCommittedVersion: () => editorSession.type === "canonical" ? `${canonicalSessionEpoch}:${editorSession.session.version}` : null,
 			isCanonicalSaveCurrent: (version) => editorSession.type === "canonical" && !editorSession.session.isComposing && editorSession.session.version === version,
 			captureCanonicalSave: () => editorSession.type === "canonical" ? editorSession.session.captureSaveSnapshot() : null,
 			getCanonicalDocument: () => editorSession.type === "canonical" ? editorSession.session.document : null,
@@ -880,6 +916,120 @@ const createHiddenEditorManager = (deps) => {
 				canRedo: () => editorSession.type === "canonical" && editorSession.session.canRedo
 			} : null,
 			canonicalOperations: {
+				applyCanonicalSectionProperties: (patch) => {
+					ensureView();
+					const fail = (message) => {
+						refuse(message, CANONICAL_GAP.sectionProperties);
+						return {
+							status: "refused",
+							gap: CANONICAL_GAP.sectionProperties,
+							message
+						};
+					};
+					if (editorSession.type === "refused") return fail(editorSession.reason);
+					if (editorSession.type !== "canonical") {
+						if (isCanonicalModelSessionRequested()) return fail("The canonical document is not ready for section changes.");
+						return null;
+					}
+					if (!view || deps.getReadOnly() || isDestroying) return fail("The document is not editable.");
+					const session = editorSession.session;
+					if (session.isComposing) return fail("Section properties cannot change during composition.");
+					const prepared = session.prepareOperations(view.state, [createCanonicalSectionPropertiesOperation(session.document, patch)]);
+					if (prepared.isErr()) return fail(prepared.error.message);
+					let failureMessage = "The section projection could not publish.";
+					if (!publishCommit(prepared.value, (message) => {
+						failureMessage = message;
+					})) return fail(failureMessage);
+					return {
+						status: "applied",
+						version: session.version
+					};
+				},
+				applyCanonicalComment: (request) => {
+					ensureView();
+					const fail = (message, retry = "never") => {
+						if (retry === "never") refuse(message, CANONICAL_GAP.comments);
+						return {
+							status: "refused",
+							gap: CANONICAL_GAP.comments,
+							message,
+							retry
+						};
+					};
+					if (editorSession.type === "refused") return fail(editorSession.reason);
+					if (editorSession.type !== "canonical") {
+						if (isCanonicalModelSessionRequested()) return fail("The canonical document is not ready for comment changes.");
+						return null;
+					}
+					if (!view || deps.getReadOnly()) return fail("The document is not editable.");
+					const session = editorSession.session;
+					if (session.isComposing) return fail("Comments cannot change during composition.", "afterComposition");
+					let command;
+					if (request.type === "create") {
+						const id = freshCommentId(session.document);
+						if (id.isErr()) return fail(id.error.message);
+						let anchor;
+						switch (request.anchor.kind) {
+							case "selection": {
+								const projection = session.projectStory(request.anchor.story);
+								if (projection.isErr()) return fail(projection.error.message);
+								const from = projection.value.addressAt(request.anchor.from);
+								const to = projection.value.addressAt(request.anchor.to);
+								if (from.isErr()) return fail(from.error.message);
+								if (to.isErr()) return fail(to.error.message);
+								anchor = request.anchor.from === request.anchor.to ? {
+									kind: "point",
+									at: from.value
+								} : {
+									kind: "range",
+									from: from.value,
+									to: to.value
+								};
+								break;
+							}
+							case "reply":
+								anchor = {
+									kind: "reply",
+									parentId: request.anchor.parentId
+								};
+								break;
+							case "revision":
+								anchor = {
+									kind: "revision",
+									story: request.anchor.story,
+									revisionId: request.anchor.revisionId
+								};
+								break;
+							default: return request.anchor;
+						}
+						command = {
+							type: "create",
+							anchor,
+							comment: {
+								id: id.value,
+								author: request.author,
+								done: false,
+								date: request.date ?? (/* @__PURE__ */ new Date()).toISOString(),
+								content: canonicalCommentBody(session.document, request.text)
+							}
+						};
+					} else command = request;
+					const compiled = compileCanonicalComments({
+						document: session.document,
+						command
+					});
+					if (compiled.isErr()) return fail(compiled.error.message);
+					if (compiled.value.ops.length > 0) {
+						const prepared = session.prepareOperations(view.state, compiled.value.ops);
+						if (prepared.isErr()) return fail(prepared.error.message);
+						if (!publishCommit(prepared.value)) return fail("The comment projection could not publish.");
+					}
+					return {
+						status: "applied",
+						comments: session.getCommittedComments(),
+						...compiled.value.commentId === void 0 ? {} : { commentId: compiled.value.commentId }
+					};
+				},
 				applyCanonicalDocumentOperations: (options) => {
 					ensureView();
 					return getPublicOperations()?.apply(options) ?? null;
@@ -914,6 +1064,7 @@ const createHiddenEditorManager = (deps) => {
 				applyCanonicalStoryHistory: ({ view: storyView, story, direction }) => {
 					if (story === OP_STORIES.MAIN && storyView === view) return history(direction);
 					if (!view || editorSession.type !== "canonical" || deps.getReadOnly()) return false;
+					syncCanonicalMode();
 					const session = editorSession.session;
 					if (direction === "undo" ? !session.canUndo : !session.canRedo) return false;
 					const prepared = direction === "undo" ? session.prepareUndo(storyView.state, story) : session.prepareRedo(storyView.state, story);
@@ -945,6 +1096,7 @@ const createHiddenEditorManager = (deps) => {
 				},
 				replaceCanonicalStoryText: ({ view: storyView, story, intent }) => {
 					if (!view || editorSession.type !== "canonical" || deps.getReadOnly()) return false;
+					syncCanonicalMode();
 					const prepared = editorSession.session.prepareReplace(storyView.state, {
 						...intent,
 						story
@@ -959,7 +1111,8 @@ const createHiddenEditorManager = (deps) => {
 			isDestroying: () => isDestroying,
 			ensureView,
 			isViewRequested
-		})
+		}),
+		isCanonicalComposing: () => editorSession.type === "canonical" && editorSession.session.isComposing
 	};
 };
 //#endregion

package/dist/controller/noteEditorManager.d.ts

@@ -16,7 +16,7 @@ type NoteEditorManagerDeps = {
   getDocument: () => document_d_exports.Document | null;
   getCanonicalApi?: (() => HiddenEditorApi | null) | undefined;
   getExperimentalSession?: (() => "canonical" | undefined) | undefined;
-  onSessionRefusal?: ((reason: string, gap: CanonicalGap) => void) | undefined;
+  onSessionRefusal?: ((reason: string, gap: CanonicalGap, error?: Error) => void) | undefined;
   getHost: () => HTMLElement | null;
   getPlugins?: (() => Plugin[]) | undefined;
   getStyles: () => document_d_exports.StyleDefinitions | null | undefined;

package/dist/controller/noteEditorManager.js

@@ -7,11 +7,13 @@ import { ExtensionManager } from "../prosemirror/extensions/ExtensionManager.js"
 import { createStarterKit } from "../prosemirror/extensions/StarterKit.js";
 import { ensureBaseDirectionInState } from "../prosemirror/extensions/features/AutoBidiDetectionExtension.js";
 import { ensureParaIdsInState } from "../prosemirror/extensions/features/ParaIdAllocatorExtension.js";
+import { noteReferenceTransactionIssue } from "../prosemirror/noteReferenceOccurrences.js";
 import { createDocumentNumberingPlugin } from "../prosemirror/plugins/documentNumbering.js";
-import { createDocumentStylesPlugin } from "../prosemirror/plugins/documentStyles.js";
+import { createDocumentStyleContextPlugin, createDocumentStylesPlugin } from "../prosemirror/plugins/documentStyles.js";
 import { schema } from "../prosemirror/schema/index.js";
 import { storyListNumbering } from "../prosemirror/storyListNumbering.js";
 import { CANONICAL_GAP, usesCanonicalSession } from "../types/canonicalCapabilities.js";
+import { CanonicalSessionError } from "./canonicalSession.js";
 import { createCanonicalStoryEditor } from "./canonicalStoryEditor.js";
 import { OP_STORIES } from "@stll/docx-core/ops";
 import { EditorState, TextSelection } from "prosemirror-state";
@@ -88,11 +90,12 @@ const createNoteEditorManager = (deps) => {
 		mounted.clear();
 		active = null;
 	};
+	const getOwnedDocument = () => usesCanonicalSession(deps.getExperimentalSession?.(), CANONICAL_GAP.authorityRouting) ? deps.getCanonicalApi?.()?.getCanonicalDocument() ?? null : deps.getDocument();
 	const sync = () => {
 		const host = deps.getHost();
 		if (!host) return;
-		if (usesCanonicalSession(deps.getExperimentalSession?.(), CANONICAL_GAP.secondaryStories) && !deps.getCanonicalApi?.()?.getCanonicalStoryProjection(OP_STORIES.MAIN)) return;
-		const document = usesCanonicalSession(deps.getExperimentalSession?.(), CANONICAL_GAP.secondaryStories) ? deps.getCanonicalApi?.()?.getCanonicalDocument() ?? deps.getDocument() : deps.getDocument();
+		if (usesCanonicalSession(deps.getExperimentalSession?.(), CANONICAL_GAP.authorityRouting) && !deps.getCanonicalApi?.()?.getCanonicalStoryProjection(OP_STORIES.MAIN)) return;
+		const document = getOwnedDocument();
 		const styles = deps.getStyles();
 		const theme = deps.getTheme();
 		const numbering = document?.package.numbering;
@@ -116,7 +119,7 @@ const createNoteEditorManager = (deps) => {
 			const existing = mounted.get(key);
 			if (existing) {
 				if (existing.mountNode.parentElement !== host) host.append(existing.mountNode);
-				if (usesCanonicalSession(deps.getExperimentalSession?.(), CANONICAL_GAP.secondaryStories)) {
+				if (usesCanonicalSession(deps.getExperimentalSession?.(), CANONICAL_GAP.authorityRouting)) {
 					const projected = deps.getCanonicalApi?.()?.getCanonicalStoryProjection({
 						kind: storyKey.kind,
 						id: storyKey.noteId
@@ -176,7 +179,7 @@ const createNoteEditorManager = (deps) => {
 				},
 				getView: () => view,
 				getApi: () => deps.getCanonicalApi?.() ?? null,
-				enabled: () => usesCanonicalSession(deps.getExperimentalSession?.(), CANONICAL_GAP.secondaryStories),
+				enabled: () => usesCanonicalSession(deps.getExperimentalSession?.(), CANONICAL_GAP.authorityRouting),
 				onRefusal: deps.onSessionRefusal,
 				onSelectionChange: () => deps.onTransaction?.({
 					...storyKey,
@@ -185,11 +188,11 @@ const createNoteEditorManager = (deps) => {
 					selectionChanged: true
 				})
 			});
-			const canonicalProjection = usesCanonicalSession(deps.getExperimentalSession?.(), CANONICAL_GAP.secondaryStories) ? deps.getCanonicalApi?.()?.getCanonicalStoryProjection({
+			const canonicalProjection = usesCanonicalSession(deps.getExperimentalSession?.(), CANONICAL_GAP.authorityRouting) ? deps.getCanonicalApi?.()?.getCanonicalStoryProjection({
 				kind: storyKey.kind,
 				id: storyKey.noteId
 			}) : null;
-			if (usesCanonicalSession(deps.getExperimentalSession?.(), CANONICAL_GAP.secondaryStories) && !canonicalProjection) {
+			if (usesCanonicalSession(deps.getExperimentalSession?.(), CANONICAL_GAP.authorityRouting) && !canonicalProjection) {
 				manager.destroy();
 				mountNode.remove();
 				continue;
@@ -198,16 +201,20 @@ const createNoteEditorManager = (deps) => {
 				...canonical.props,
 				state: canonicalProjection ? EditorState.create({
 					doc: canonicalProjection,
-					plugins: [createDocumentStylesPlugin(styles), createDocumentNumberingPlugin(numbering)]
+					plugins: [createDocumentStyleContextPlugin(styles), createDocumentNumberingPlugin(numbering)]
 				}) : buildInitialState(proseDocument, styles, numbering, manager, externalPlugins),
 				dispatchTransaction(transaction) {
 					if (canonical.dispatch(transaction)) return;
-					view.updateState(view.state.apply(transaction));
+					const nextState = view.state.apply(transaction);
+					const docChanged = !nextState.doc.eq(view.state.doc);
+					view.updateState(nextState);
+					const noteIssue = noteReferenceTransactionIssue(transaction);
+					if (noteIssue) deps.onSessionRefusal?.(noteIssue.message, CANONICAL_GAP.dispatch, noteIssue);
 					const mountedStory = mounted.get(key);
-					if (mountedStory && transaction.docChanged) mountedStory.dirty = true;
+					if (mountedStory && docChanged) mountedStory.dirty = true;
 					deps.onTransaction?.({
 						...storyKey,
-						docChanged: transaction.docChanged,
+						docChanged,
 						selectionChanged: transaction.selectionSet,
 						view
 					});
@@ -245,9 +252,17 @@ const createNoteEditorManager = (deps) => {
 		destroy,
 		getActive: () => active,
 		getView: (story) => mounted.get(storyMapKey(story))?.view ?? null,
-		listStories: () => enumerateDocumentNoteStories(deps.getDocument()),
+		listStories: () => enumerateDocumentNoteStories(getOwnedDocument()),
 		snapshotDocument: (document) => {
-			if (usesCanonicalSession(deps.getExperimentalSession?.(), CANONICAL_GAP.secondaryStories)) return deps.getCanonicalApi?.()?.getCanonicalDocument() ?? document;
+			if (usesCanonicalSession(deps.getExperimentalSession?.(), CANONICAL_GAP.authorityRouting)) {
+				const canonical = deps.getCanonicalApi?.()?.getCanonicalDocument();
+				if (canonical) return canonical;
+				throw new CanonicalSessionError({
+					gap: CANONICAL_GAP.authorityRouting,
+					reason: "refused",
+					message: "Canonical story snapshot is unavailable."
+				});
+			}
 			let footnotes = document.package.footnotes;
 			let endnotes = document.package.endnotes;
 			let footnotesChanged = false;

package/dist/docx/builtInStyles.js

@@ -1,5 +1,5 @@
 import { BUILT_IN_DEFAULT_PARAGRAPH_STYLE_NAME, resolveDefaultParagraphStyle } from "./defaultParagraphStyle.js";
-import { headingLevelOf } from "@stll/docx-core/model";
+import { headingLevelOf, headingOutlineLevel } from "@stll/docx-core/model";
 //#region src/docx/builtInStyles.ts
 /**
 * Whether a paragraph is a heading, and of which level, without reading the
@@ -134,20 +134,27 @@ const headingOutlineLevelFromStyleName = (name) => {
 const CANONICAL_BY_NORMALIZED = new Map(Object.values(BUILT_IN_STYLE_NAME).map((name) => [normalizeStyleName(name), name]));
 const asBuiltInName = (normalized) => CANONICAL_BY_NORMALIZED.get(normalized);
 /**
-* The outline level a style chain sets: the style's own `w:outlineLvl`, else
-* the nearest ancestor's (17.7.1). `styleParser` already flattens `w:basedOn`
-* for a parsed package, but a style set built in memory carries the raw chain,
-* so the walk keeps both kinds of input on the same answer. `seen` guards the
-* circular `basedOn` a malformed package can contain.
+* The effective outline contribution of a style chain: the nearest explicit
+* `w:outlineLvl` wins across the chain; only when none exists does the nearest
+* built-in heading name supply its implicit level. `styleParser` already flattens
+* `w:basedOn` for a parsed package, but a style set built in memory carries the
+* raw chain, so the walk keeps both kinds of input on the same answer. `seen`
+* guards the circular `basedOn` a malformed package can contain.
 */
 const inheritedOutlineLevel = (style, styleById) => {
 	const seen = /* @__PURE__ */ new Set();
 	let current = style;
+	let nearestImplicitHeadingLevel;
 	while (current && !seen.has(current.styleId)) {
 		seen.add(current.styleId);
 		if (current.pPr?.outlineLevel !== void 0) return current.pPr.outlineLevel;
+		if (nearestImplicitHeadingLevel === void 0) {
+			const namedLevel = headingOutlineLevelFromStyleName(current.name);
+			if (namedLevel !== void 0) nearestImplicitHeadingLevel = headingOutlineLevel(namedLevel);
+		}
 		current = current.basedOn === void 0 ? void 0 : styleById.get(current.basedOn);
 	}
+	return nearestImplicitHeadingLevel;
 };
 /** The level a heading style is indexed under, or undefined if it is not one. */
 const headingLevelForIndex = (namedLevel, statedLevel) => {

package/dist/docx/containerChildren.gen.d.ts

@@ -35,9 +35,11 @@ declare const CONTAINER_CHILDREN: {
   readonly "w:fldSimple": readonly ["bdo", "bookmarkEnd", "bookmarkStart", "commentRangeEnd", "commentRangeStart", "customXml", "customXmlDelRangeEnd", "customXmlDelRangeStart", "customXmlInsRangeEnd", "customXmlInsRangeStart", "customXmlMoveFromRangeEnd", "customXmlMoveFromRangeStart", "customXmlMoveToRangeEnd", "customXmlMoveToRangeStart", "del", "dir", "fldData", "fldSimple", "hyperlink", "ins", "moveFrom", "moveFromRangeEnd", "moveFromRangeStart", "moveTo", "moveToRangeEnd", "moveToRangeStart", "permEnd", "permStart", "proofErr", "r", "sdt", "smartTag", "subDoc"];
   readonly "block-content": readonly ["altChunk", "bookmarkEnd", "bookmarkStart", "commentRangeEnd", "commentRangeStart", "customXml", "customXmlDelRangeEnd", "customXmlDelRangeStart", "customXmlInsRangeEnd", "customXmlInsRangeStart", "customXmlMoveFromRangeEnd", "customXmlMoveFromRangeStart", "customXmlMoveToRangeEnd", "customXmlMoveToRangeStart", "del", "ins", "moveFrom", "moveFromRangeEnd", "moveFromRangeStart", "moveTo", "moveToRangeEnd", "moveToRangeStart", "p", "permEnd", "permStart", "proofErr", "sdt", "sectPr", "tbl", "tcPr"];
 };
+/** WordprocessingML children permitted directly inside CT_RunTrackChange. */
+declare const TRACKED_RUN_WORDPROCESSING_CHILDREN: readonly ["bdo", "bookmarkEnd", "bookmarkStart", "commentRangeEnd", "commentRangeStart", "customXml", "customXmlDelRangeEnd", "customXmlDelRangeStart", "customXmlInsRangeEnd", "customXmlInsRangeStart", "customXmlMoveFromRangeEnd", "customXmlMoveFromRangeStart", "customXmlMoveToRangeEnd", "customXmlMoveToRangeStart", "del", "dir", "ins", "moveFrom", "moveFromRangeEnd", "moveFromRangeStart", "moveTo", "moveToRangeEnd", "moveToRangeStart", "permEnd", "permStart", "proofErr", "r", "sdt", "smartTag"];
 /** A container the shared child dispatcher covers. */
 type DispatchedContainer = keyof typeof CONTAINER_CHILDREN;
 /** Every child name the schema declares for `Container`. */
 type DeclaredChild<Container extends DispatchedContainer> = (typeof CONTAINER_CHILDREN)[Container][number];
 //#endregion
-export { CONTAINER_CHILDREN, DeclaredChild, DispatchedContainer };
+export { CONTAINER_CHILDREN, DeclaredChild, DispatchedContainer, TRACKED_RUN_WORDPROCESSING_CHILDREN };

package/dist/docx/containerChildren.gen.js

@@ -260,5 +260,37 @@ const CONTAINER_CHILDREN = {
 	],
 	...SEQUENCE_CHILDREN
 };
+/** WordprocessingML children permitted directly inside CT_RunTrackChange. */
+const TRACKED_RUN_WORDPROCESSING_CHILDREN = [
+	"bdo",
+	"bookmarkEnd",
+	"bookmarkStart",
+	"commentRangeEnd",
+	"commentRangeStart",
+	"customXml",
+	"customXmlDelRangeEnd",
+	"customXmlDelRangeStart",
+	"customXmlInsRangeEnd",
+	"customXmlInsRangeStart",
+	"customXmlMoveFromRangeEnd",
+	"customXmlMoveFromRangeStart",
+	"customXmlMoveToRangeEnd",
+	"customXmlMoveToRangeStart",
+	"del",
+	"dir",
+	"ins",
+	"moveFrom",
+	"moveFromRangeEnd",
+	"moveFromRangeStart",
+	"moveTo",
+	"moveToRangeEnd",
+	"moveToRangeStart",
+	"permEnd",
+	"permStart",
+	"proofErr",
+	"r",
+	"sdt",
+	"smartTag"
+];
 //#endregion
-export { CONTAINER_CHILDREN };
+export { CONTAINER_CHILDREN, TRACKED_RUN_WORDPROCESSING_CHILDREN };

package/dist/docx/fieldParser.js

@@ -231,8 +231,20 @@ function finalizeComplexField(ctx) {
 * @returns The display text
 */
 function getFieldDisplayValue(field) {
-	if (field.type === "simpleField") return field.content.filter((c) => "content" in c).map((run) => getRunText(run)).join("");
-	return field.fieldResult.map((run) => getRunText(run)).join("");
+	const displayText = (content) => content.map((child) => {
+		switch (child.type) {
+			case "run": return getRunText(child);
+			case "hyperlink": return displayText(child.children);
+			case "inlineWrapper":
+			case "insertion":
+			case "deletion":
+			case "moveFrom":
+			case "moveTo": return displayText(child.content);
+			case "preservedInline": return child.text;
+			default: return "";
+		}
+	}).join("");
+	return displayText(field.type === "simpleField" ? field.content : field.fieldResult);
 }
 /**
 * Helper to get text from a run (simplified)

package/dist/docx/hyperlinkParser.d.ts

@@ -86,7 +86,7 @@ declare const HYPERLINK_CHILD_HANDLERS: {
   readonly permEnd: "capture";
   readonly permStart: "capture";
   readonly proofErr: "capture";
-  readonly sdt: "capture";
+  readonly sdt: (child: XmlElement, { push }: HyperlinkChildContext) => void;
   readonly subDoc: "capture";
 };
 /**

package/dist/docx/hyperlinkParser.js

@@ -1,6 +1,7 @@
 import { sanitizeExternalUrl } from "../utils/urlSecurity.js";
 import { CAPTURE, dispatchChildrenWithContext, ownedElsewhere, withPreservedChildren } from "./containerChildren.js";
 import { inlineWrapperOf } from "./inlineWrapperParser.js";
+import { preserveLinkedSdt } from "./linkedSdtPreservation.js";
 import { preserveInlineChild, preservedInlineCapture } from "./preservedRunContent.js";
 import { standalonePreviewLedger } from "./previewBudget.js";
 import { RELATIONSHIP_TYPES, resolveRelationshipIdOfType } from "./relsParser.js";
@@ -9,6 +10,22 @@ import { runHoldsPayload } from "./runPayload.js";
 import { getAttribute, mergeXmlnsDeclarations, parseNumericAttribute, parseOnOffAttribute } from "./xmlParser.js";
 //#region src/docx/hyperlinkParser.ts
 /**
+* Hyperlink Parser - Parse hyperlinks (w:hyperlink) with URL resolution
+*
+* OOXML Reference:
+* - Hyperlink element: w:hyperlink
+* - Attributes:
+*   - r:id - Relationship ID for external link (resolves via .rels)
+*   - w:anchor - Internal bookmark name
+*   - w:tooltip - Tooltip/title text
+*   - w:tgtFrame - Target frame (_blank, _self, etc.)
+*   - w:history - Whether to add to history
+*   - w:docLocation - Location within a document
+*
+* External links use r:id to reference a relationship in document.xml.rels
+* Internal links use w:anchor to reference a bookmark in the same document
+*/
+/**
 * Parse bookmark start (w:bookmarkStart)
 *
 * Used for internal hyperlink targets within the document.
@@ -169,7 +186,9 @@ const HYPERLINK_CHILD_HANDLERS = {
 	permEnd: CAPTURE,
 	permStart: CAPTURE,
 	proofErr: CAPTURE,
-	sdt: CAPTURE,
+	sdt: (child, { push }) => {
+		push(preserveLinkedSdt(child));
+	},
 	subDoc: CAPTURE
 };
 const LINKED_SMART_TAG_PROPERTIES_OWNER = ownedElsewhere({

package/dist/docx/inlineWrapperContent.d.ts

@@ -138,14 +138,14 @@ declare const SIMPLE_FIELD_CONTENT: {
   readonly commentRangeStart: false;
   readonly commentReference: false;
   readonly complexField: false;
-  readonly deletion: false;
+  readonly deletion: true;
   readonly inlineSdt: false;
-  readonly insertion: false;
+  readonly insertion: true;
   readonly mathEquation: false;
-  readonly moveFrom: false;
+  readonly moveFrom: true;
   readonly moveFromRangeEnd: false;
   readonly moveFromRangeStart: false;
-  readonly moveTo: false;
+  readonly moveTo: true;
   readonly moveToRangeEnd: false;
   readonly moveToRangeStart: false;
   readonly simpleField: false;

package/dist/docx/inlineWrapperContent.js

@@ -137,14 +137,14 @@ const SIMPLE_FIELD_CONTENT = {
 	commentRangeStart: false,
 	commentReference: false,
 	complexField: false,
-	deletion: false,
+	deletion: true,
 	inlineSdt: false,
-	insertion: false,
+	insertion: true,
 	mathEquation: false,
-	moveFrom: false,
+	moveFrom: true,
 	moveFromRangeEnd: false,
 	moveFromRangeStart: false,
-	moveTo: false,
+	moveTo: true,
 	moveToRangeEnd: false,
 	moveToRangeStart: false,
 	simpleField: false

package/dist/docx/linkedSdtPreservation.d.ts

@@ -0,0 +1,10 @@
+import { XmlElement } from "./xmlParser.js";
+//#region src/docx/linkedSdtPreservation.d.ts
+declare const UnrepresentableLinkedSdtRevisionError_base: import("better-result").TaggedErrorClass<"UnrepresentableLinkedSdtRevisionError">;
+declare class UnrepresentableLinkedSdtRevisionError extends UnrepresentableLinkedSdtRevisionError_base<{
+  message: string;
+}> {}
+/** Capture only the unsupported hyperlink child, never its enclosing revision. */
+declare const preserveLinkedSdt: (root: XmlElement) => import("@stll/docx-core/model").PreservedInline;
+//#endregion
+export { UnrepresentableLinkedSdtRevisionError, preserveLinkedSdt };