@stll/folio-core 0.47.5 → 0.47.7

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

@@ -1,5 +1,5 @@
 import { AUTHOR_COLORS, getAuthorColorIdx } from "../../../utils/authorColors.js";
-import { expectTrackedChangeMarkAttrs } from "../../attrs/index.js";
+import { expectTrackedChangeMarkAttrs, isTrackedRevisionAncestorArray } from "../../attrs/index.js";
 import { createMarkExtension } from "../create.js";
 //#region src/prosemirror/extensions/marks/TrackedChangeExtensions.ts
 /**
@@ -31,6 +31,15 @@ const SUGGESTION_TINT = "var(--suggestion-bg, color-mix(in oklch, #6d3bd6 12%, t
 const SUGGESTION_TINT_LAYER = `linear-gradient(${SUGGESTION_TINT}, ${SUGGESTION_TINT})`;
 const suggestedInsertionStyle = () => `color: ${SUGGESTION_COLOR}; text-decoration: underline; text-decoration-style: dotted; text-decoration-color: ${SUGGESTION_COLOR}; background-image: ${SUGGESTION_TINT_LAYER};`;
 const suggestedDeletionStyle = () => `color: ${SUGGESTION_COLOR}; text-decoration: line-through; text-decoration-style: dotted; text-decoration-color: ${SUGGESTION_COLOR}; background-image: ${SUGGESTION_TINT_LAYER};`;
+const revisionAncestorsFromDom = (serialized) => {
+	if (serialized === void 0) return null;
+	try {
+		const value = JSON.parse(serialized);
+		return isTrackedRevisionAncestorArray(value) ? value : false;
+	} catch {
+		return false;
+	}
+};
 /**
 * Insertion mark — text added in tracked changes
 * Renders with per-author colored underline.
@@ -47,21 +56,27 @@ const InsertionExtension = createMarkExtension({
 			moveKind: { default: null },
 			initials: { default: null },
 			provenance: { default: "user" },
-			suggestionId: { default: null }
+			suggestionId: { default: null },
+			_docxOuterWrapperCount: { default: null },
+			_docxRevisionAncestors: { default: null }
 		},
 		inclusive: false,
 		parseDOM: [{
 			tag: "span.docx-insertion",
 			getAttrs(dom) {
+				const ancestors = revisionAncestorsFromDom(dom.dataset["revisionAncestors"]);
+				if (ancestors === false) return false;
 				return {
 					revisionId: Number.parseInt(dom.dataset["revisionId"] ?? "0", 10),
 					author: dom.dataset["author"] ?? "",
-					date: dom.dataset["date"] ?? null
+					date: dom.dataset["date"] ?? null,
+					_docxOuterWrapperCount: dom.dataset["outerWrapperCount"] ? Number(dom.dataset["outerWrapperCount"]) : null,
+					_docxRevisionAncestors: ancestors
 				};
 			}
 		}],
 		toDOM(mark) {
-			const { revisionId, author, date, provenance, suggestionId } = expectTrackedChangeMarkAttrs(mark);
+			const { revisionId, author, date, provenance, suggestionId, _docxOuterWrapperCount, _docxRevisionAncestors } = expectTrackedChangeMarkAttrs(mark);
 			const idx = getAuthorColorIdx(author);
 			const color = AUTHOR_COLORS[idx] ?? "#000000";
 			const titleParts = [author, date ? new Date(date).toLocaleDateString() : ""].filter(Boolean);
@@ -76,6 +91,8 @@ const InsertionExtension = createMarkExtension({
 					...suggested ? { "data-provenance": "suggested" } : {},
 					...suggested && suggestionId ? { "data-suggestion-id": suggestionId } : {},
 					...date ? { "data-date": date } : {},
+					..._docxOuterWrapperCount != null ? { "data-outer-wrapper-count": String(_docxOuterWrapperCount) } : {},
+					..._docxRevisionAncestors ? { "data-revision-ancestors": JSON.stringify(_docxRevisionAncestors) } : {},
 					...titleParts.length > 0 ? { title: `${suggested ? "Suggested" : "Inserted"}: ${titleParts.join(", ")}` } : {},
 					style: suggested ? suggestedInsertionStyle() : insertionStyle(color)
 				},
@@ -101,21 +118,27 @@ const DeletionExtension = createMarkExtension({
 			initials: { default: null },
 			provenance: { default: "user" },
 			suggestionId: { default: null },
-			_historicalFormatting: { default: null }
+			_historicalFormatting: { default: null },
+			_docxOuterWrapperCount: { default: null },
+			_docxRevisionAncestors: { default: null }
 		},
 		inclusive: false,
 		parseDOM: [{
 			tag: "span.docx-deletion",
 			getAttrs(dom) {
+				const ancestors = revisionAncestorsFromDom(dom.dataset["revisionAncestors"]);
+				if (ancestors === false) return false;
 				return {
 					revisionId: Number.parseInt(dom.dataset["revisionId"] ?? "0", 10),
 					author: dom.dataset["author"] ?? "",
-					date: dom.dataset["date"] ?? null
+					date: dom.dataset["date"] ?? null,
+					_docxOuterWrapperCount: dom.dataset["outerWrapperCount"] ? Number(dom.dataset["outerWrapperCount"]) : null,
+					_docxRevisionAncestors: ancestors
 				};
 			}
 		}],
 		toDOM(mark) {
-			const { revisionId, author, date, provenance, suggestionId } = expectTrackedChangeMarkAttrs(mark);
+			const { revisionId, author, date, provenance, suggestionId, _docxOuterWrapperCount, _docxRevisionAncestors } = expectTrackedChangeMarkAttrs(mark);
 			const idx = getAuthorColorIdx(author);
 			const color = AUTHOR_COLORS[idx] ?? "#000000";
 			const titleParts = [author, date ? new Date(date).toLocaleDateString() : ""].filter(Boolean);
@@ -130,6 +153,8 @@ const DeletionExtension = createMarkExtension({
 					...suggested ? { "data-provenance": "suggested" } : {},
 					...suggested && suggestionId ? { "data-suggestion-id": suggestionId } : {},
 					...date ? { "data-date": date } : {},
+					..._docxOuterWrapperCount != null ? { "data-outer-wrapper-count": String(_docxOuterWrapperCount) } : {},
+					..._docxRevisionAncestors ? { "data-revision-ancestors": JSON.stringify(_docxRevisionAncestors) } : {},
 					...titleParts.length > 0 ? { title: `${suggested ? "Suggested deletion" : "Deleted"}: ${titleParts.join(", ")}` } : {},
 					style: suggested ? suggestedDeletionStyle() : deletionStyle(color)
 				},

package/dist/prosemirror/runIdentity.d.ts

@@ -13,16 +13,16 @@ declare const RUN_IDENTITY_MARK_NAME = "runIdentity";
 type RunIdentityPayload = {
   preservedAttributes?: readonly document_d_exports.PreservedAttribute[] | undefined;
   preserved?: document_d_exports.PreservedMarkup | undefined;
+  emptyFormatting?: boolean | undefined;
 };
 /** A run identity's attrs in canonical form. */
-declare const runIdentityAttrs: (id: number, { preservedAttributes, preserved }?: RunIdentityPayload) => RunIdentityMarkAttrs;
+declare const runIdentityAttrs: (id: number, { preservedAttributes, preserved, emptyFormatting }?: RunIdentityPayload) => RunIdentityMarkAttrs;
 /**
  * Whether a run holds markup the mark exists to carry.
  *
- * The mint condition, minus the page break: a run with neither remainder nor
- * sink and no break to rejoin its leaves across needs no identity, and 57.5%
- * of corpus files hold none.
+ * The payload condition. The conversion also mints an identity for runs whose
+ * page break or mixed inline atoms split one authored run into several leaves.
  */
-declare const hasRunIdentityPayload: ({ preservedAttributes, preserved }: RunIdentityPayload) => boolean;
+declare const hasRunIdentityPayload: ({ preservedAttributes, preserved, emptyFormatting }: RunIdentityPayload) => boolean;
 //#endregion
 export { RUN_IDENTITY_ATTRIBUTE, RUN_IDENTITY_MARK_NAME, RunIdentityPayload, hasRunIdentityPayload, runIdentityAttrs };

package/dist/prosemirror/runIdentity.js

@@ -18,19 +18,19 @@ const preservedMarkup = ({ children }) => ({ children: (children ?? []).map(({ i
 	xml
 })) });
 /** A run identity's attrs in canonical form. */
-const runIdentityAttrs = (id, { preservedAttributes, preserved } = {}) => {
+const runIdentityAttrs = (id, { preservedAttributes, preserved, emptyFormatting } = {}) => {
 	const attrs = { id };
 	if (preservedAttributes && preservedAttributes.length > 0) attrs.preservedAttributes = preservedAttributes.map(preservedAttribute);
 	if (preserved && (preserved.children?.length ?? 0) > 0) attrs.preserved = preservedMarkup(preserved);
+	if (emptyFormatting) attrs.emptyFormatting = true;
 	return attrs;
 };
 /**
 * Whether a run holds markup the mark exists to carry.
 *
-* The mint condition, minus the page break: a run with neither remainder nor
-* sink and no break to rejoin its leaves across needs no identity, and 57.5%
-* of corpus files hold none.
+* The payload condition. The conversion also mints an identity for runs whose
+* page break or mixed inline atoms split one authored run into several leaves.
 */
-const hasRunIdentityPayload = ({ preservedAttributes, preserved }) => (preservedAttributes?.length ?? 0) > 0 || (preserved?.children?.length ?? 0) > 0;
+const hasRunIdentityPayload = ({ preservedAttributes, preserved, emptyFormatting }) => (preservedAttributes?.length ?? 0) > 0 || (preserved?.children?.length ?? 0) > 0 || emptyFormatting === true;
 //#endregion
 export { RUN_IDENTITY_ATTRIBUTE, RUN_IDENTITY_MARK_NAME, hasRunIdentityPayload, runIdentityAttrs };

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

@@ -1,4 +1,4 @@
-import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, InlineWrapperAttrs, InlineWrapperKind, InlineWrapperLayer, LanguageAttrs, RunFormattingOverrideAttrs, RunIdentityMarkAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, UnderlineAttrs } from "./marks.js";
+import { CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, InlineWrapperAttrs, InlineWrapperKind, InlineWrapperLayer, LanguageAttrs, RunFormattingOverrideAttrs, RunIdentityMarkAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, StrikeAttrs, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, TrackedRevisionAncestor, UnderlineAttrs } from "./marks.js";
 import { BlockSdtAttrs, BookmarkBoundaryAttrs, FieldAttrs, HardBreakAttrs, ImageAttrs, ImagePositionAttrs, MathAttrs, PageBreakRunAttrs, ParagraphAttrs, ParagraphPropertyChangeAttrs, PreservedBlockAttrs, PreservedXmlAttrs, PreservedXmlLevel, SdtAttrs, ShapeAttrs, SymbolAttrs, TabAttrs, TableAttrs, TableCellAttrs, TableRowAttrs, TextBoxAttrs } from "./nodes.js";
 import { ExtensionManager } from "../extensions/ExtensionManager.js";
 //#region src/prosemirror/schema/index.d.ts
@@ -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 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 InlineWrapperAttrs, type InlineWrapperKind, type InlineWrapperLayer, type LanguageAttrs, type MathAttrs, type PageBreakRunAttrs, type ParagraphAttrs, type ParagraphPropertyChangeAttrs, type PreservedBlockAttrs, type PreservedXmlAttrs, type PreservedXmlLevel, type RunFormattingOverrideAttrs, type RunIdentityMarkAttrs, 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 InlineWrapperAttrs, type InlineWrapperKind, type InlineWrapperLayer, type LanguageAttrs, type MathAttrs, type PageBreakRunAttrs, type ParagraphAttrs, type ParagraphPropertyChangeAttrs, type PreservedBlockAttrs, type PreservedXmlAttrs, type PreservedXmlLevel, type RunFormattingOverrideAttrs, type RunIdentityMarkAttrs, 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 TrackedRevisionAncestor, type UnderlineAttrs, schema, singletonManager };

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

@@ -99,6 +99,15 @@ type CommentAttrs = {
  */
 declare const TRACKED_CHANGE_PROVENANCE_VALUES: readonly ["user", "suggested"];
 type TrackedChangeProvenance = (typeof TRACKED_CHANGE_PROVENANCE_VALUES)[number];
+type TrackedRevisionAncestor = {
+  type: "insertion" | "deletion" | "moveFrom" | "moveTo";
+  revisionId: number;
+  author: string;
+  date?: string;
+  utcDate?: string;
+  initials?: string;
+  outerWrapperCount: number;
+};
 type TrackedChangeMarkAttrs = {
   revisionId: number;
   author: string;
@@ -108,6 +117,10 @@ type TrackedChangeMarkAttrs = {
   /** Optional author initials (w:initials) carried through the round-trip. */
   initials?: string;
   moveKind?: "moveTo" | "moveFrom";
+  /** Number of inline-wrapper layers authored outside this revision. */
+  _docxOuterWrapperCount?: number;
+  /** Outer revisions, in authored order, that ProseMirror cannot hold as nested marks. */
+  _docxRevisionAncestors?: readonly TrackedRevisionAncestor[];
   /** Defaults to `"user"`; `"suggested"` for AI-proposed, non-serialized edits. */
   provenance: TrackedChangeProvenance;
   /**
@@ -136,7 +149,7 @@ type RunPropertyChangeMarkAttrs = {
  * in the schema would force a resolution.
  *
  * Minted only when the run has something to carry — a page break, an
- * attribute remainder, or a property-set remainder — so a document that
+ * attribute remainder, or authored run properties — so a document that
  * carries none pays nothing.
  */
 type RunIdentityMarkAttrs = {
@@ -146,6 +159,8 @@ type RunIdentityMarkAttrs = {
   preservedAttributes?: readonly document_d_exports.PreservedAttribute[];
   /** The `w:rPr` children no reader took a value from, with their ordinals. */
   preserved?: document_d_exports.PreservedMarkup;
+  /** Preserve an authored empty `w:rPr`, distinct from no run properties. */
+  emptyFormatting?: true;
 };
 /**
  * One transparent wrapper a leaf sits inside, minus the content ProseMirror
@@ -289,4 +304,4 @@ type HyperlinkAttrs = {
   _docxHyperlinkIndex?: number;
 };
 //#endregion
-export { AuthoredRunFormattingValues, COMPLEX_SCRIPT_RUN_PROPERTY_KEYS, CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, ComplexScriptRunPropertyKey, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, InlineWrapperAttrs, InlineWrapperKind, InlineWrapperLayer, LanguageAttrs, RUN_FORMATTING_BOOLEAN_PROPERTIES, RUN_FORMATTING_PROPERTY_SPECS, RUN_FORMATTING_VALUE_PROPERTIES, RunFormattingBooleanProperty, RunFormattingOverrideAttrs, RunFormattingValueProperty, RunIdentityMarkAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, StrikeAttrs, TRACKED_CHANGE_PROVENANCE_VALUES, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, TrackedChangeProvenance, UnderlineAttrs };
+export { AuthoredRunFormattingValues, COMPLEX_SCRIPT_RUN_PROPERTY_KEYS, CharacterSpacingAttrs, CharacterStyleAttrs, CommentAttrs, ComplexScriptRunPropertyKey, EmphasisMarkAttrs, FontFamilyAttrs, FontSizeAttrs, FootnoteRefAttrs, HighlightAttrs, HyperlinkAttrs, InlineWrapperAttrs, InlineWrapperKind, InlineWrapperLayer, LanguageAttrs, RUN_FORMATTING_BOOLEAN_PROPERTIES, RUN_FORMATTING_PROPERTY_SPECS, RUN_FORMATTING_VALUE_PROPERTIES, RunFormattingBooleanProperty, RunFormattingOverrideAttrs, RunFormattingValueProperty, RunIdentityMarkAttrs, RunPropertyChangeMarkAttrs, RunShadingAttrs, StrikeAttrs, TRACKED_CHANGE_PROVENANCE_VALUES, TextColorAttrs, TextEffectAttrs, TrackedChangeMarkAttrs, TrackedChangeProvenance, TrackedRevisionAncestor, UnderlineAttrs };

package/dist/prosemirror/utils/extractTrackedChanges.js

@@ -1,4 +1,4 @@
-import { expectRunPropertyChangeMarkAttrs } from "../attrs/index.js";
+import { expectRunPropertyChangeMarkAttrs, expectTrackedChangeMarkAttrs } from "../attrs/index.js";
 import { nodePropertyRevisionSites, propertyRevisionMetadata, propertyRevisionRecords } from "../revisionCarriers.js";
 import { getTableCellMergeChange } from "../tableCellMergeRevision.js";
 //#region src/prosemirror/utils/extractTrackedChanges.ts
@@ -46,6 +46,7 @@ function extractTrackedChanges(state) {
 	const runPropertyChangeType = schema.marks["runPropertyChange"];
 	if (!insertionType && !deletionType && !runPropertyChangeType) return EMPTY_RESULT;
 	const raw = [];
+	const nestedRevisionIds = /* @__PURE__ */ new Set();
 	const commentToRevision = /* @__PURE__ */ new Map();
 	const commentMetadata = /* @__PURE__ */ new Map();
 	const rowRevisionScopes = [];
@@ -223,14 +224,28 @@ function extractTrackedChanges(state) {
 			if (mark.type === insertionType || mark.type === deletionType) {
 				tcMark = mark;
 				if (foldIntoRowRevision(rowRevisionScopes.at(-1), mark)) continue;
+				const attrs = expectTrackedChangeMarkAttrs(mark);
+				if (attrs._docxRevisionAncestors?.length) nestedRevisionIds.add(attrs.revisionId);
+				for (const ancestor of attrs._docxRevisionAncestors ?? []) {
+					nestedRevisionIds.add(ancestor.revisionId);
+					raw.push({
+						type: ancestor.type === "insertion" || ancestor.type === "moveTo" ? "insertion" : "deletion",
+						text: inlineText,
+						author: ancestor.author,
+						date: ancestor.date,
+						from: pos,
+						to: pos + node.nodeSize,
+						revisionId: ancestor.revisionId
+					});
+				}
 				raw.push({
 					type: mark.type === insertionType ? "insertion" : "deletion",
 					text: inlineText,
-					author: mark.attrs["author"] || "",
-					date: mark.attrs["date"],
+					author: attrs.author,
+					date: attrs.date,
 					from: pos,
 					to: pos + node.nodeSize,
-					revisionId: mark.attrs["revisionId"]
+					revisionId: attrs.revisionId
 				});
 			}
 		}
@@ -380,7 +395,7 @@ function extractTrackedChanges(state) {
 			merged.push({ ...entry });
 			continue;
 		}
-		const key = `${entry.type}|${entry.author}|${entry.date ?? ""}`;
+		const key = `${entry.type}|${entry.author}|${entry.date ?? ""}|${nestedRevisionIds.has(entry.revisionId) ? entry.revisionId : ""}`;
 		const group = inlineGroups.get(key);
 		if (group) {
 			const sep = group.to === entry.from ? "" : " ";
@@ -403,7 +418,7 @@ function extractTrackedChanges(state) {
 	for (let i = 0; i < merged.length; i++) {
 		const curr = merged[i];
 		const next = merged[i + 1];
-		if (curr.type === "deletion" && next && next.type === "insertion" && curr.author === next.author && curr.to === next.from) {
+		if (curr.type === "deletion" && next && next.type === "insertion" && !nestedRevisionIds.has(curr.revisionId) && !nestedRevisionIds.has(next.revisionId) && curr.author === next.author && curr.to === next.from) {
 			final.push({
 				type: "replacement",
 				text: next.text,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.47.5",
+  "version": "0.47.7",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",