@stll/folio-core 0.58.5 → 0.59.0

package/dist/prosemirror/selectionState.js

@@ -1,6 +1,7 @@
 import { FONT_THEME_VALUES } from "../types/documentEnumValues.js";
 import { expectFontFamilyMarkAttrs, expectFontSizeMarkAttrs, expectHighlightMarkAttrs, expectParagraphAttrs, expectStrikeMarkAttrs, expectTextColorMarkAttrs, expectUnderlineMarkAttrs } from "./attrs/index.js";
 import { resolveListState } from "./listState.js";
+import { effectiveParagraphNumbering, paragraphNumberingSourcesFromBoundary } from "./numberingAttr.js";
 import { directionIsRtl } from "./paragraphDirection.js";
 import { getDocumentNumbering } from "./plugins/documentNumbering.js";
 import { collectMarksInRange } from "./selectionMarks.js";
@@ -46,7 +47,10 @@ function extractSelectionSnapshot(state) {
 		styleId,
 		startParagraphIndex,
 		endParagraphIndex,
-		listState: resolveListState(getDocumentNumbering(state), paragraphFormatting.numPr)
+		listState: resolveListState(getDocumentNumbering(state), effectiveParagraphNumbering(paragraphNumberingSourcesFromBoundary({
+			numPr: paragraphAttrs?.numPr,
+			numPrFromStyle: paragraphAttrs?.numPrFromStyle
+		})))
 	};
 }
 /** Compatibility entry point used by existing React and Vue integrations. */

package/dist/prosemirror/storyListNumbering.js

@@ -1,6 +1,6 @@
 import { createNumberingIdAllocator } from "../docx/numberingIds.js";
 import { getCachedNumberingMap, isBulletLevel } from "../docx/numberingParser.js";
-import { paragraphNumberingLevel, paragraphNumberingReference, paragraphNumberingReferenceId } from "../docx/numberingReference.js";
+import { paragraphNumberingReference } from "../docx/numberingReference.js";
 import { expectParagraphAttrs } from "./attrs/index.js";
 import { completeNumberingForDoc, paragraphListReferences } from "./listInstanceReferences.js";
 import { paragraphNumberingAttr } from "./numberingAttr.js";
@@ -8,13 +8,12 @@ import { getPackageNumberingDefinitions } from "./plugins/documentNumbering.js";
 import { Transform } from "prosemirror-transform";
 //#region src/prosemirror/storyListNumbering.ts
 const remappedNumPr = (numPr, numIds) => {
-	const numId = paragraphNumberingReferenceId(numPr ?? void 0);
-	const next = numId === void 0 ? void 0 : numIds.get(numId);
+	if (numPr?.kind !== "reference") return numPr;
+	const next = numIds.get(numPr.numId);
 	if (next === void 0) return numPr;
-	const ilvl = paragraphNumberingLevel(numPr ?? void 0);
-	return paragraphNumberingAttr(paragraphNumberingReference(ilvl === void 0 ? { numId: next } : {
+	return paragraphNumberingAttr(paragraphNumberingReference(numPr.ilvl === void 0 ? { numId: next } : {
 		numId: next,
-		ilvl
+		ilvl: numPr.ilvl
 	}));
 };
 const remappedAbstractNumId = (abstractNumId, remap) => {
@@ -47,10 +46,10 @@ const storyListNumbering = (state, numbering) => {
 			const abstractId = change.previousFormatting?.listAbstractNumId;
 			if (typeof abstractId === "number") existingAbstractNumIds.add(abstractId);
 		}
-		const numId = paragraphNumberingReferenceId(attrs.numPr);
-		if (numId !== void 0 && !storyBase.has(numId) && definedMap?.hasNumbering(numId)) {
-			const level = definedMap.getLevel(numId, paragraphNumberingLevel(attrs.numPr) ?? 0);
-			if (!(level !== null && isBulletLevel(level) === (attrs.listIsBullet === true) && (attrs.listAbstractNumId ?? void 0) === (definedMap.getAbstractNumId(numId) ?? void 0))) colliding.add(numId);
+		const statedNumbering = attrs.numPr;
+		if (statedNumbering?.kind === "reference" && !storyBase.has(statedNumbering.numId) && definedMap?.hasNumbering(statedNumbering.numId)) {
+			const level = definedMap.getLevel(statedNumbering.numId, statedNumbering.ilvl ?? 0);
+			if (!(level !== null && isBulletLevel(level) === (attrs.listIsBullet === true) && (attrs.listAbstractNumId ?? void 0) === (definedMap.getAbstractNumId(statedNumbering.numId) ?? void 0))) colliding.add(statedNumbering.numId);
 		}
 		return false;
 	});
@@ -69,11 +68,11 @@ const storyListNumbering = (state, numbering) => {
 	state.doc.descendants((node, pos) => {
 		if (node.type.name !== "paragraph") return true;
 		const attrs = expectParagraphAttrs(node);
-		const numId = paragraphNumberingReferenceId(attrs.numPr);
+		const numId = attrs.numPr?.kind === "reference" ? attrs.numPr.numId : void 0;
 		const moves = numId !== void 0 && remap.numIds.has(numId);
 		const changes = attrs._propertyChanges?.map((change) => {
 			const previous = change.previousFormatting;
-			const previousNumId = paragraphNumberingReferenceId(previous?.numPr ?? void 0);
+			const previousNumId = previous?.numPr?.kind === "reference" ? previous.numPr.numId : void 0;
 			if (!previous || previousNumId === void 0 || !remap.numIds.has(previousNumId)) return change;
 			return {
 				...change,

package/dist/prosemirror/styles/paragraphStyleCascade.js

@@ -1,4 +1,4 @@
-import { mergeParagraphNumbering, paragraphNumberingReferenceId } from "../../docx/numberingReference.js";
+import { paragraphNumberingReferenceId } from "../../docx/numberingReference.js";
 import { mergeParagraphFormatting, mergeParagraphTabStops } from "../../utils/paragraphFormattingMerge.js";
 import { mergeTextFormatting } from "../../utils/textFormattingMerge.js";
 import { paragraphNumberingAttr } from "../numberingAttr.js";
@@ -103,11 +103,7 @@ function paragraphStyleCascadeAttrs({ styleId, formatting, styleResolver, tableP
 	set("direction", directionFromBidi(formatting?.bidi ?? stylePpr?.bidi));
 	set("defaultTextFormatting", resolveParagraphDefaultTextFormatting(styleId, formatting, styleResolver, { includeParagraphMarkRunProperties }));
 	const styleNumbering = stylePpr?.numPr;
-	if (styleNumbering?.kind === "reference" && (formatting?.numPr === void 0 || formatting.numPr.kind === "levelOnly")) {
-		const merged = mergeParagraphNumbering(styleNumbering, formatting?.numPr);
-		if (merged !== void 0) attrs.numPr = paragraphNumberingAttr(merged);
-		attrs.numPrFromStyle = paragraphNumberingAttr(styleNumbering);
-	}
+	if (styleNumbering?.kind === "reference" && (formatting?.numPr === void 0 || formatting.numPr.kind === "levelOnly")) attrs.numPrFromStyle = paragraphNumberingAttr(styleNumbering);
 	return {
 		attrs,
 		stylePpr

package/dist/prosemirror/styles/resolvedStyleAttrs.d.ts

@@ -4,6 +4,16 @@ import { ResolvedParagraphStyle } from "./styleResolver.js";
 import { NumberingMap } from "../../docx/numberingParser.js";
 import { DirectParagraphIndentation } from "../paragraphIndentation.js";
 //#region src/prosemirror/styles/resolvedStyleAttrs.d.ts
+/**
+ * Shared helper for projecting a resolved paragraph style onto ProseMirror
+ * paragraph node attrs.
+ *
+ * Both `applyStyle` (toolbar style picker) and the Enter handler's
+ * next-style switch need to write the same set of style-controlled attrs.
+ * Keeping the projection in one place ensures the two paths stay in sync —
+ * a style applied via the picker and a style applied on Enter produce
+ * identical paragraph attrs.
+ */
 type ResolvedStyleIdentity = {
   styleId: string;
   styleName?: string;
@@ -59,9 +69,6 @@ declare function listIndentationProvenancePatch({ direct, styleFormatting, numbe
  */
 declare function listLevelIndentRemovalPatch(attrs: Readonly<ParagraphAttrs>, numbering: NumberingMap | null | undefined): ParagraphAttrsPatch;
 /** Recompute every level-dependent attr when a paragraph changes list level. */
-declare function listLevelAttrPatch(attrs: Pick<ParagraphAttrs, "listImplicitChildLevelAdvances" | "_originalFormatting" | "_resolvedFormatting" | "_styleResolvedFormatting" | "numPr" | "numPrFromStyle" | "indentLeft" | "indentRight" | "indentFirstLine" | "hangingIndent">, numPr: {
-  numId: number;
-  ilvl: number;
-}, numbering: NumberingMap | null | undefined): ParagraphAttrsPatch;
+declare function listLevelAttrPatch(attrs: Pick<ParagraphAttrs, "listImplicitChildLevelAdvances" | "_originalFormatting" | "_resolvedFormatting" | "_styleResolvedFormatting" | "numPr" | "numPrFromStyle" | "indentLeft" | "indentRight" | "indentFirstLine" | "hangingIndent">, ilvl: number, numbering: NumberingMap | null | undefined): ParagraphAttrsPatch;
 //#endregion
 export { listAttrsFromNumbering, listAttrsFromResolvedStyle, listIndentationProvenancePatch, listLevelAttrPatch, listLevelIndentRemovalPatch, paragraphAttrsFromResolvedStyle };

package/dist/prosemirror/styles/resolvedStyleAttrs.js

@@ -4,21 +4,12 @@ import { tableOfContentsStyleLevel } from "../../utils/tableOfContentsStyle.js";
 import { setAutospacingBaseValue } from "../autospacingBase.js";
 import { CLEARED_LIST_RENDERING_ATTRS } from "../listMarker.js";
 import { listRenderingAttrPatch } from "../listRenderingAttrs.js";
-import { paragraphNumberingAttr } from "../numberingAttr.js";
+import { effectiveParagraphNumbering, effectiveParagraphNumberingReference, paragraphNumberingAttr, paragraphNumberingSourcesFromBoundary } from "../numberingAttr.js";
 import { styleResolvedParagraphFormatting } from "../paragraphFormattingProvenance.js";
 import { directParagraphIndentation, paragraphIndentationAttrPatch, paragraphIndentationFromFormatting, withDirectParagraphIndentation } from "../paragraphIndentation.js";
+import { panic } from "better-result";
 //#region src/prosemirror/styles/resolvedStyleAttrs.ts
 /**
-* Shared helper for projecting a resolved paragraph style onto ProseMirror
-* paragraph node attrs.
-*
-* Both `applyStyle` (toolbar style picker) and the Enter handler's
-* next-style switch need to write the same set of style-controlled attrs.
-* Keeping the projection in one place ensures the two paths stay in sync —
-* a style applied via the picker and a style applied on Enter produce
-* identical paragraph attrs.
-*/
-/**
 * The paragraph attrs a style definition controls. Applying a style resets
 * every one of these to the style's value (or `null` to clear), so a prior
 * style's properties (e.g. a heading's spacing) never leak through. Returns
@@ -82,10 +73,13 @@ function listAttrsFromResolvedStyle(resolved, numbering) {
 	const numPr = resolved.paragraphFormatting?.numPr;
 	if (numPr?.kind !== "reference") return null;
 	const { numId, ilvl = 0 } = numPr;
-	const attrs = listAttrsFromNumbering({
-		numId,
-		ilvl
-	}, numbering);
+	const attrs = {
+		...listAttrsFromNumbering({
+			numId,
+			ilvl
+		}, numbering),
+		numPr: null
+	};
 	attrs.numPrFromStyle = paragraphNumberingAttr(paragraphNumberingReference({
 		numId,
 		ilvl
@@ -173,7 +167,10 @@ function listIndentationProvenancePatch({ direct, styleFormatting, numberingSour
 * {@link listLevelIndentAttrPatch}.
 */
 function listLevelIndentRemovalPatch(attrs, numbering) {
-	if (attrs.numPr?.kind !== "reference") return {};
+	if (effectiveParagraphNumbering(paragraphNumberingSourcesFromBoundary({
+		numPr: attrs.numPr,
+		numPrFromStyle: attrs.numPrFromStyle
+	}))?.kind !== "reference") return {};
 	const direct = directParagraphIndentation(attrs);
 	return {
 		...listIndentationProvenancePatch({
@@ -187,15 +184,28 @@ function listLevelIndentRemovalPatch(attrs, numbering) {
 	};
 }
 /** Recompute every level-dependent attr when a paragraph changes list level. */
-function listLevelAttrPatch(attrs, numPr, numbering) {
+function listLevelAttrPatch(attrs, ilvl, numbering) {
+	const reference = effectiveParagraphNumberingReference(paragraphNumberingSourcesFromBoundary({
+		numPr: attrs.numPr,
+		numPrFromStyle: attrs.numPrFromStyle
+	}));
+	if (reference === void 0) panic("Cannot change list level without an effective numbering reference");
+	const numPr = {
+		numId: reference.numId,
+		ilvl
+	};
 	const direct = directParagraphIndentation(attrs);
 	return {
 		...listAttrsFromNumbering(numPr, numbering),
+		...attrs.numPr?.kind !== "reference" && attrs.numPrFromStyle?.kind === "reference" ? { numPr: paragraphNumberingAttr({
+			kind: "levelOnly",
+			ilvl: numPr.ilvl
+		}) } : {},
 		listImplicitChildLevelAdvances: attrs.listImplicitChildLevelAdvances ?? null,
 		...listIndentationProvenancePatch({
 			direct,
 			styleFormatting: attrs._styleResolvedFormatting,
-			numberingSource: attrs.numPrFromStyle == null ? "paragraph" : "style",
+			numberingSource: attrs.numPr?.kind === "reference" || attrs.numPrFromStyle == null ? "paragraph" : "style",
 			numPr,
 			numbering
 		}),

package/dist/prosemirror/yjsDocumentMetadata.d.ts

@@ -8,20 +8,26 @@ import * as Y from "yjs";
  */
 type AttrSchemaMigrationStep = (fragment: Y.XmlFragment) => number;
 /** Every attr-schema version this build reads, oldest first, with no gaps. */
-declare const FOLIO_YJS_ATTR_SCHEMA_VERSIONS: readonly [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
+declare const FOLIO_YJS_ATTR_SCHEMA_VERSIONS: readonly [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13];
 /** An attr-schema version this build can read. */
 type FolioYjsAttrSchemaVersion = (typeof FOLIO_YJS_ATTR_SCHEMA_VERSIONS)[number];
 /**
  * The attr-schema version this build writes. Derived against the migration map
  * so the constant and the map cannot disagree.
  */
-declare const FOLIO_YJS_ATTR_SCHEMA_VERSION = 12;
+declare const FOLIO_YJS_ATTR_SCHEMA_VERSION = 13;
 declare const FolioYjsNoteReferenceSchemaError_base: import("better-result").TaggedErrorClass<"FolioYjsNoteReferenceSchemaError">;
 declare class FolioYjsNoteReferenceSchemaError extends FolioYjsNoteReferenceSchemaError_base<{
   message: string;
   schemaVersion: FolioYjsAttrSchemaVersion;
   requiredSchemaVersion: FolioYjsAttrSchemaVersion;
 }> {}
+declare const FolioYjsNumberingSourceSchemaError_base: import("better-result").TaggedErrorClass<"FolioYjsNumberingSourceSchemaError">;
+declare class FolioYjsNumberingSourceSchemaError extends FolioYjsNumberingSourceSchemaError_base<{
+  message: string;
+  schemaVersion: FolioYjsAttrSchemaVersion;
+  requiredSchemaVersion: FolioYjsAttrSchemaVersion;
+}> {}
 /**
  * The steps that carry a snapshot written under `fromVersion` up to
  * {@link FOLIO_YJS_ATTR_SCHEMA_VERSION}, in order. Empty when the snapshot is
@@ -76,4 +82,4 @@ declare const writeYjsDocumentMetadata: (ydoc: Y.Doc, document: Node) => void;
 declare const readYjsParagraphSourceContract: (ydoc: Y.Doc) => string | null;
 declare const withParagraphSourceContract: (document: Node, contract: string) => Node;
 //#endregion
-export { FOLIO_YJS_ATTR_SCHEMA_VERSION, FolioYjsAttrSchemaVersion, FolioYjsAttrSchemaVersionError, FolioYjsNoteReferenceSchemaError, applyAttrSchemaMigrations, attrSchemaMigrationSteps, proseDocumentParagraphSourceContract, readYjsAttrSchemaVersion, readYjsParagraphSourceContract, withParagraphSourceContract, writeYjsAttrSchemaVersion, writeYjsDocumentMetadata };
+export { FOLIO_YJS_ATTR_SCHEMA_VERSION, FolioYjsAttrSchemaVersion, FolioYjsAttrSchemaVersionError, FolioYjsNoteReferenceSchemaError, FolioYjsNumberingSourceSchemaError, applyAttrSchemaMigrations, attrSchemaMigrationSteps, proseDocumentParagraphSourceContract, readYjsAttrSchemaVersion, readYjsParagraphSourceContract, withParagraphSourceContract, writeYjsAttrSchemaVersion, writeYjsDocumentMetadata };

package/dist/prosemirror/yjsDocumentMetadata.js

@@ -475,7 +475,8 @@ const FOLIO_YJS_ATTR_SCHEMA_VERSIONS = [
 	9,
 	10,
 	11,
-	12
+	12,
+	13
 ];
 /**
 * The one place a persisted attr-shape change is decided.
@@ -500,14 +501,44 @@ const ATTR_SCHEMA_MIGRATIONS = {
 	9: dropUnstatedPlaceholderFlags,
 	10: renamePageBreakRunOwnerMarkAttr,
 	11: stampMarkerOnly,
-	12: "current"
+	12: stampMarkerOnly,
+	13: "current"
 };
 /**
 * The attr-schema version this build writes. Derived against the migration map
 * so the constant and the map cannot disagree.
 */
-const FOLIO_YJS_ATTR_SCHEMA_VERSION = 12;
+const FOLIO_YJS_ATTR_SCHEMA_VERSION = 13;
 var FolioYjsNoteReferenceSchemaError = class extends TaggedError("FolioYjsNoteReferenceSchemaError") {};
+var FolioYjsNumberingSourceSchemaError = class extends TaggedError("FolioYjsNumberingSourceSchemaError") {};
+/** Older snapshots can hold a resolved style reference where a stated override belongs. */
+const requireStatedNumberingSources = (fragment, schemaVersion) => {
+	if (schemaVersion === 13) return;
+	const pending = [];
+	const visit = (node) => {
+		if ("getAttributes" in node) pending.push(node.getAttributes());
+		for (const child of node.toArray()) if (typeof child !== "string" && !isXmlText(child) && "toArray" in child) visit(child);
+	};
+	visit(fragment);
+	const seen = /* @__PURE__ */ new WeakSet();
+	while (pending.length > 0) {
+		const value = pending.pop();
+		if (typeof value !== "object" || value === null || seen.has(value)) continue;
+		seen.add(value);
+		if (Array.isArray(value)) {
+			for (const entry of value) pending.push(entry);
+			continue;
+		}
+		if (!isRecord(value)) continue;
+		const numbering = value["numPr"];
+		if (isRecord(value["numPrFromStyle"]) && isRecord(numbering) && (numbering["kind"] === "reference" || "numId" in numbering)) throw new FolioYjsNumberingSourceSchemaError({
+			schemaVersion,
+			requiredSchemaVersion: 13,
+			message: `Yjs schema ${schemaVersion} has ambiguous numbering ownership; schema 13 requires stated numbering overrides. Rebuild the collaboration state from the saved DOCX.`
+		});
+		for (const entry of Object.values(value)) pending.push(entry);
+	}
+};
 /** Check before any migration mutates the snapshot or any PM builder can drop text. */
 const requireNoteOccurrenceAttribution = (fragment, schemaVersion) => {
 	const visit = (node) => {
@@ -524,8 +555,8 @@ const requireNoteOccurrenceAttribution = (fragment, schemaVersion) => {
 				if (isRecord(reference) && isNoteReferenceOccurrenceId(reference["occurrenceId"])) continue;
 				throw new FolioYjsNoteReferenceSchemaError({
 					schemaVersion,
-					requiredSchemaVersion: 12,
-					message: `Yjs schema ${schemaVersion} has unattributed note references; schema 12 requires occurrence identities. Rebuild the collaboration state from the saved DOCX.`
+					requiredSchemaVersion: 13,
+					message: `Yjs schema ${schemaVersion} has unattributed note references; schema 13 requires occurrence identities. Rebuild the collaboration state from the saved DOCX.`
 				});
 			}
 		}
@@ -557,7 +588,8 @@ const attrSchemaMigrationSteps = (fromVersion) => FOLIO_YJS_ATTR_SCHEMA_VERSIONS
 */
 const applyAttrSchemaMigrations = (ydoc, fragment, fromVersion) => {
 	requireNoteOccurrenceAttribution(fragment, fromVersion);
-	if (fromVersion === 12) return 0;
+	requireStatedNumberingSources(fragment, fromVersion);
+	if (fromVersion === 13) return 0;
 	let rewritten = 0;
 	ydoc.transact(() => {
 		for (const step of attrSchemaMigrationSteps(fromVersion)) rewritten += step(fragment);
@@ -567,7 +599,7 @@ const applyAttrSchemaMigrations = (ydoc, fragment, fromVersion) => {
 };
 /** Raised when a snapshot's attr-schema marker is ahead of the running code. */
 var FolioYjsAttrSchemaVersionError = class extends TaggedError("FolioYjsAttrSchemaVersionError") {};
-const isReadableVersion = (marker) => typeof marker === "number" && Number.isInteger(marker) && marker >= 0 && marker <= 12;
+const isReadableVersion = (marker) => typeof marker === "number" && Number.isInteger(marker) && marker >= 0 && marker <= 13;
 /**
 * The attr-schema version a collaboration document was written under.
 *
@@ -585,7 +617,7 @@ const readYjsAttrSchemaVersion = (ydoc) => {
 	return Result.err(new FolioYjsAttrSchemaVersionError({
 		marker,
 		message: "The collaboration snapshot was written by a newer Folio attr schema than this build reads.",
-		supportedVersion: 12
+		supportedVersion: 13
 	}));
 };
 const proseDocumentParagraphSourceContract = (document) => {
@@ -593,7 +625,7 @@ const proseDocumentParagraphSourceContract = (document) => {
 };
 /** Stamp the attr-schema version of the build that wrote the current fragment. */
 const writeYjsAttrSchemaVersion = (ydoc) => {
-	ydoc.getMap(FOLIO_YJS_METADATA_MAP_NAME).set(ATTR_SCHEMA_VERSION_KEY, 12);
+	ydoc.getMap(FOLIO_YJS_METADATA_MAP_NAME).set(ATTR_SCHEMA_VERSION_KEY, 13);
 };
 /**
 * Write both metadata bindings for a freshly seeded collaboration document.
@@ -618,4 +650,4 @@ const withParagraphSourceContract = (document, contract) => {
 	}, document.content, document.marks);
 };
 //#endregion
-export { FOLIO_YJS_ATTR_SCHEMA_VERSION, FolioYjsAttrSchemaVersionError, FolioYjsNoteReferenceSchemaError, applyAttrSchemaMigrations, attrSchemaMigrationSteps, proseDocumentParagraphSourceContract, readYjsAttrSchemaVersion, readYjsParagraphSourceContract, withParagraphSourceContract, writeYjsAttrSchemaVersion, writeYjsDocumentMetadata };
+export { FOLIO_YJS_ATTR_SCHEMA_VERSION, FolioYjsAttrSchemaVersionError, FolioYjsNoteReferenceSchemaError, FolioYjsNumberingSourceSchemaError, applyAttrSchemaMigrations, attrSchemaMigrationSteps, proseDocumentParagraphSourceContract, readYjsAttrSchemaVersion, readYjsParagraphSourceContract, withParagraphSourceContract, writeYjsAttrSchemaVersion, writeYjsDocumentMetadata };

package/dist/redline.d.ts

@@ -20,6 +20,12 @@ declare class InvalidGenerateRedlineDocxOptionsError extends InvalidGenerateRedl
   option: "baseView" | "revisedView";
   receivedValue: unknown;
 }> {}
+declare const GenerateRedlineDocxResourceImportError_base: import("better-result").TaggedErrorClass<"GenerateRedlineDocxResourceImportError">;
+/** Raised before body operations when revised resources cannot be imported atomically. */
+declare class GenerateRedlineDocxResourceImportError extends GenerateRedlineDocxResourceImportError_base<{
+  message: string;
+  detail: string;
+}> {}
 /** A document story that could not be paired across the two input packages. */
 type GenerateRedlineUnprocessedStory = {
   /** Story in the base package, or `null` when it exists only in the revision. */
@@ -29,6 +35,14 @@ type GenerateRedlineUnprocessedStory = {
   /** Why the story could not be represented in the generated redline. */
   reason: "missing-base-story" | "missing-revised-story";
 };
+/** A source-undefined style cleared so it cannot acquire unrelated base meaning. */
+type GenerateRedlineReferenceWarning = {
+  /** Position in the revised story's ProseMirror projection. */
+  paragraphPosition: number;
+  story: FolioDocumentStoryHandle;
+  kind: "style";
+  id: string;
+};
 /** Result of {@link generateRedlineDocx}. */
 type GenerateRedlineDocxResult = {
   /** The base package with generated tracked changes. */
@@ -37,6 +51,8 @@ type GenerateRedlineDocxResult = {
   applied: FolioAIEditAppliedOperation[];
   /** Block operations that could not be applied. */
   skipped: FolioAIEditSkippedOperation[];
+  /** Undefined source references cleared to avoid binding to a base definition. */
+  referenceWarnings: GenerateRedlineReferenceWarning[];
   /** Package parts that could not be represented as story-scoped text edits. */
   unprocessedStories: GenerateRedlineUnprocessedStory[];
   /** Privacy transforms applied to the generated package. */
@@ -45,4 +61,4 @@ type GenerateRedlineDocxResult = {
 /** Compare two buffers and return tracked changes for every matched editable story. */
 declare const generateRedlineDocx: (base: ArrayBuffer, revised: ArrayBuffer, options?: GenerateRedlineDocxOptions) => Promise<GenerateRedlineDocxResult>;
 //#endregion
-export { GenerateRedlineDocxOptions, GenerateRedlineDocxResult, GenerateRedlineUnprocessedStory, InvalidGenerateRedlineDocxOptionsError, generateRedlineDocx };
+export { GenerateRedlineDocxOptions, GenerateRedlineDocxResourceImportError, GenerateRedlineDocxResult, GenerateRedlineReferenceWarning, GenerateRedlineUnprocessedStory, InvalidGenerateRedlineDocxOptionsError, generateRedlineDocx };

package/dist/redline.js

@@ -1,8 +1,11 @@
 import { FolioDocxReviewer, getFolioDocxComparisonAccess, isFolioResolvedReviewedView } from "./ai-edits/headless.js";
+import { classifyResourceReference } from "./ai-edits/referenceClassification.js";
 import { createFolioAITextRangeHandle, trailingBodyBlockId } from "./ai-edits/snapshot.js";
 import { createScopedWordDiffOptions } from "./ai-edits/word-diff.js";
 import { FolioContentInlinePresentationProjectionError } from "./compare/content.js";
 import { inlineFormattingSegments } from "./compare/formatting.js";
+import { importStyleClosureWithNumbering } from "./compare/import-style-closure.js";
+import { createInsertedResourceProjection, rebindInsertedResourceBlocks } from "./compare/inserted-resource-snapshot.js";
 import "./document-operations.js";
 import { pairFolioDocumentStories } from "./document-stories.js";
 import { resolveFolioDocumentPrivacyTransforms, rewriteDocxMetadataPrivacy } from "./docx/metadataPrivacy.js";
@@ -23,6 +26,8 @@ import { TaggedError, panic } from "better-result";
 */
 /** Raised when a resolved input view is not `"original"` or `"final"`. */
 var InvalidGenerateRedlineDocxOptionsError = class extends TaggedError("InvalidGenerateRedlineDocxOptionsError") {};
+/** Raised before body operations when revised resources cannot be imported atomically. */
+var GenerateRedlineDocxResourceImportError = class extends TaggedError("GenerateRedlineDocxResourceImportError") {};
 const nextBaseBlockIdByIndex = (events) => {
 	const nextIds = Array.from({ length: events.length });
 	let nextId = null;
@@ -136,68 +141,83 @@ const statedOrCleared = (revised, anchor) => revised ?? (anchor === void 0 ? voi
 * beside a list item stays plain.
 */
 const insertedParagraphProperties = (block, anchor) => {
+	const paragraph = paragraphBlockOf(block);
+	if (paragraph === void 0) return {};
+	const anchorParagraph = anchor === void 0 ? void 0 : paragraphBlockOf(anchor);
 	const properties = {};
-	const styleId = statedOrCleared(block.styleId, anchor?.styleId);
+	const styleId = statedOrCleared(paragraph.styleId, anchorParagraph?.styleId);
 	if (styleId !== void 0) properties.styleId = styleId;
-	const alignment = statedOrCleared(block.directAlignment, anchor?.directAlignment);
+	const alignment = statedOrCleared(paragraph.directAlignment, anchorParagraph?.directAlignment);
 	if (alignment !== void 0) properties.alignment = alignment;
-	const spacing = statedOrCleared(block.directSpacing, anchor?.directSpacing);
+	const spacing = statedOrCleared(paragraph.directSpacing, anchorParagraph?.directSpacing);
 	if (spacing !== void 0) properties.spacing = spacing;
-	const indentation = statedOrCleared(block.directIndentation, anchor?.directIndentation);
+	const indentation = statedOrCleared(paragraph.directIndentation, anchorParagraph?.directIndentation);
 	if (indentation !== void 0) properties.indentation = indentation;
-	if (block.listReference !== void 0 || anchor?.listReference !== void 0 || anchor?.listLevel !== void 0) {
-		properties.numbering = block.listReference ?? null;
-		properties.listLevel = block.listLevel ?? null;
-	} else if (block.listLevel !== void 0) properties.listLevel = block.listLevel;
+	properties.numbering = paragraph.statedNumbering;
 	return properties;
 };
-const insertedNumbering = (operation) => {
-	if (operation.type !== "insertBeforeBlock" && operation.type !== "insertAfterBlock") return null;
-	const numbering = operation.numbering;
-	return numbering && !("start" in numbering) ? numbering : null;
+const paragraphBlockOf = (block) => {
+	switch (block.kind) {
+		case "paragraph":
+		case "heading":
+		case "listItem": return block;
+		case "diagnostic": return;
+		default: return panic("Unhandled redline block kind", { block });
+	}
 };
 /** The `w:numId`s whose `w:num` and abstract definition both exist. */
 const definedNumIds = (numbering) => {
 	const abstractIds = new Set(numbering?.abstractNums.map((entry) => entry.abstractNumId));
 	return new Set((numbering?.nums ?? []).filter((entry) => abstractIds.has(entry.abstractNumId)).map((entry) => entry.numId));
 };
-/**
-* Rebind every inserted list item to numbering the redline package defines.
-* The redline is the base package, where the revised version's `w:numId` may
-* name nothing, or another list: the referenced definitions are copied in,
-* under a fresh id wherever the base uses that one for different numbering.
-* A reference the revised package cannot resolve shows no number there
-* either, and is inserted without one.
-*/
-const bindInsertedNumbering = (baseReviewer, revisedReviewer, operationsByStory) => {
-	const baseAccess = getFolioDocxComparisonAccess(baseReviewer);
+/** Unresolvable source references have no visible list; retain only importable resources. */
+const insertedNumberingReferences = (revisedReviewer, snapshots) => {
 	const revisedNumbering = getFolioDocxComparisonAccess(revisedReviewer).numberingDefinitions();
 	const resolvable = definedNumIds(revisedNumbering);
-	const references = operationsByStory.flatMap((operations) => operations.flatMap((operation) => {
-		const numbering = insertedNumbering(operation);
-		return numbering && resolvable.has(numbering.numId) ? [numbering] : [];
-	}));
-	const remapped = baseAccess.planTargetNumberingReferences(revisedNumbering, references) ?? panic("Resolvable revised numbering references could not be planned");
-	baseAccess.stageTargetNumbering(revisedNumbering, references, remapped);
-	const defined = definedNumIds(baseAccess.numberingDefinitions());
-	return operationsByStory.map((operations) => operations.map((operation) => {
-		const numbering = insertedNumbering(operation);
-		if (numbering === null) return operation;
-		const numId = remapped.get(numbering.numId) ?? numbering.numId;
-		if (!resolvable.has(numbering.numId) || !defined.has(numId)) return {
-			...operation,
-			numbering: null,
-			listLevel: null
-		};
-		return {
-			...operation,
-			numbering: {
-				numId,
-				level: numbering.level
-			}
-		};
+	return snapshots.flatMap((snapshot) => snapshot.blocks.flatMap((block) => {
+		const reference = paragraphBlockOf(block)?.listReference;
+		return reference && resolvable.has(reference.numId) ? [reference] : [];
 	}));
 };
+const prepareInsertedReferences = ({ original, rebound, sourceStyles, destinationStyles, paragraphPosition, story }) => {
+	const source = paragraphBlockOf(original);
+	const imported = paragraphBlockOf(rebound);
+	const warnings = [];
+	if (source === void 0 || imported === void 0) return {
+		block: rebound,
+		warnings
+	};
+	let block = { ...imported };
+	if (source.styleId !== void 0) {
+		const disposition = classifyResourceReference({
+			kind: "style",
+			id: source.styleId,
+			sourceDefines: (id) => sourceStyles.has(id),
+			destinationDefines: (id) => destinationStyles.has(id)
+		});
+		if (disposition !== "sourceDefined") block = { ...source };
+		if (disposition === "destinationCollision") {
+			delete block.styleId;
+			warnings.push({
+				kind: "style",
+				id: source.styleId,
+				paragraphPosition,
+				story
+			});
+		} else if (disposition === "unknown") block.styleId = source.styleId;
+	}
+	if (source.statedNumbering.kind === "reference") {
+		block.statedNumbering = imported.statedNumbering;
+		if (imported.listReference === void 0) delete block.listReference;
+		else block.listReference = imported.listReference;
+		if (imported.displayLabel === void 0) delete block.displayLabel;
+		else block.displayLabel = imported.displayLabel;
+	}
+	return {
+		block,
+		warnings
+	};
+};
 const resolveInputView = (value, option) => {
 	if (value === void 0) return "final";
 	if (!isFolioResolvedReviewedView(value)) throw new InvalidGenerateRedlineDocxOptionsError({
@@ -221,6 +241,10 @@ const generateRedlineDocx = async (base, revised, options = {}) => {
 	})) panic("A listed base story could not be resolved");
 	const applied = [];
 	const skipped = [];
+	const referenceWarnings = [];
+	const baseAccess = getFolioDocxComparisonAccess(baseReviewer);
+	const sourceAccess = getFolioDocxComparisonAccess(revisedReviewer);
+	const sourceStyles = new Set(sourceAccess.styleDefinitions()?.styles.map(({ styleId }) => styleId));
 	const unprocessedStories = [];
 	const wordDiff = createScopedWordDiffOptions({});
 	let operationSequence = 0;
@@ -250,21 +274,57 @@ const generateRedlineDocx = async (base, revised, options = {}) => {
 			view: revisedView
 		})?.snapshot;
 		if (!baseSnapshot || !revisedSnapshot) panic("A matched document story could not be read");
-		const operations = buildRedlineOperations({
-			baseSnapshot,
-			revisedBlocks: revisedSnapshot.blocks,
-			nextOperationId
-		});
-		if (operations.length === 0) continue;
 		plannedStories.push({
 			story: pair.baseStory,
 			snapshot: baseSnapshot,
-			operations
+			revisedSnapshot,
+			inserted: createInsertedResourceProjection({
+				base: baseSnapshot,
+				revised: revisedSnapshot
+			})
+		});
+	}
+	const insertedSnapshots = plannedStories.map(({ inserted }) => inserted.snapshot);
+	const numberingReferences = insertedNumberingReferences(revisedReviewer, insertedSnapshots);
+	const resources = importStyleClosureWithNumbering({
+		destination: baseReviewer,
+		source: revisedReviewer,
+		snapshots: insertedSnapshots,
+		importedHeaderFooterSnapshots: insertedSnapshots,
+		numberingReferences
+	});
+	const { styleImport } = resources;
+	if (styleImport.status === "unalignable" || resources.numberingStage === "conflict") {
+		const detail = styleImport.status === "unalignable" ? styleImport.detail : `target numbering references ${numberingReferences.map(({ numId, level }) => `${numId}:${level}`).join(", ")} cannot be imported without changing existing references`;
+		throw new GenerateRedlineDocxResourceImportError({
+			message: `The revised style/numbering closure cannot be imported: ${detail}`,
+			detail
 		});
 	}
-	const boundOperations = bindInsertedNumbering(baseReviewer, revisedReviewer, plannedStories.map(({ operations }) => operations));
-	for (const [index, { story, snapshot }] of plannedStories.entries()) {
-		const operations = boundOperations[index] ?? panic("A planned story lost its operations");
+	const destinationStyles = new Set(baseAccess.styleDefinitions()?.styles.map(({ styleId }) => styleId));
+	for (const [index, { story, snapshot, revisedSnapshot, inserted }] of plannedStories.entries()) {
+		const insertedById = rebindInsertedResourceBlocks(inserted, resources.snapshots.at(index) ?? panic("A redline resource import lost its snapshot"));
+		const originalBlocksById = new Map(revisedSnapshot.blocks.map((block) => [block.id, block]));
+		for (const [id, imported] of insertedById) {
+			const original = originalBlocksById.get(id) ?? panic("A carried insertion lost its original block");
+			const anchor = revisedSnapshot.anchors[id] ?? panic("A carried insertion lost its original position");
+			const prepared = prepareInsertedReferences({
+				original,
+				rebound: imported,
+				sourceStyles,
+				destinationStyles,
+				paragraphPosition: anchor.from,
+				story
+			});
+			insertedById.set(id, prepared.block);
+			referenceWarnings.push(...prepared.warnings);
+		}
+		const operations = buildRedlineOperations({
+			baseSnapshot: snapshot,
+			revisedBlocks: revisedSnapshot.blocks.map((block) => insertedById.get(block.id) ?? block),
+			nextOperationId
+		});
+		if (operations.length === 0) continue;
 		const result = baseReviewer.applyDocumentOperationsToStory({
 			story,
 			snapshot,
@@ -274,7 +334,7 @@ const generateRedlineDocx = async (base, revised, options = {}) => {
 				operations
 			},
 			wordDiff,
-			undefinedStyles: "keep"
+			undefinedReferences: "keep"
 		});
 		applied.push(...result.applied);
 		skipped.push(...result.skipped);
@@ -291,9 +351,10 @@ const generateRedlineDocx = async (base, revised, options = {}) => {
 		buffer: privacyResult.buffer,
 		applied,
 		skipped,
+		referenceWarnings,
 		unprocessedStories,
 		privacyReport: privacyResult.privacyReport
 	};
 };
 //#endregion
-export { InvalidGenerateRedlineDocxOptionsError, generateRedlineDocx };
+export { GenerateRedlineDocxResourceImportError, InvalidGenerateRedlineDocxOptionsError, generateRedlineDocx };