@stll/folio-core 0.47.3 → 0.47.5

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

@@ -16,6 +16,7 @@ import { panic } from "better-result";
 * extend the wrapper over text the author wrote outside it.
 */
 const INLINE_WRAPPER_MARK_NAME = "inlineWrapper";
+const INLINE_WRAPPER_HYPERLINK_ORIGIN_ATTRIBUTE = "data-inline-wrapper-hyperlink-origin";
 /** What a tagged layer's element name is spelled as on the rendered span. */
 const TAGGED_ELEMENT_ATTRIBUTES = {
 	smartTag: "data-smart-tag-element",
@@ -54,22 +55,39 @@ const InlineWrapperExtension = createMarkExtension({
 	name: INLINE_WRAPPER_MARK_NAME,
 	schemaMarkName: INLINE_WRAPPER_MARK_NAME,
 	markSpec: {
-		attrs: { 
-		/** Outermost first. `null` is no wrapper, which is the absence of the mark. */
-stack: { default: null } },
+		attrs: {
+			/** Outermost first. `null` is no wrapper, which is the absence of the mark. */
+			stack: { default: null },
+			_docxHyperlinkIndex: { default: null },
+			_docxInsideHyperlinkStackStart: { default: null }
+		},
 		inclusive: false,
 		parseDOM: [{
 			tag: `[${INLINE_WRAPPER_STACK_ATTRIBUTE}]`,
 			getAttrs(dom) {
 				const stack = parseInlineWrapperStack(dom.getAttribute(INLINE_WRAPPER_STACK_ATTRIBUTE));
-				return stack === null ? false : { stack };
+				if (stack === null) return false;
+				const origin = dom.getAttribute(INLINE_WRAPPER_HYPERLINK_ORIGIN_ATTRIBUTE);
+				if (origin === null) return { stack };
+				const match = /^(\d+):(\d+)$/u.exec(origin);
+				if (match === null) return false;
+				const hyperlinkIndex = Number(match[1]);
+				const stackStart = Number(match[2]);
+				if (!Number.isSafeInteger(hyperlinkIndex) || !Number.isSafeInteger(stackStart) || stackStart >= stack.length) return false;
+				return {
+					stack,
+					_docxHyperlinkIndex: hyperlinkIndex,
+					_docxInsideHyperlinkStackStart: stackStart
+				};
 			}
 		}],
 		toDOM(mark) {
-			const { stack } = expectInlineWrapperMarkAttrs(mark);
+			const { stack, _docxHyperlinkIndex, _docxInsideHyperlinkStackStart } = expectInlineWrapperMarkAttrs(mark);
 			const innermost = stack.at(-1);
 			if (innermost === void 0) panic("An inline wrapper mark carries at least one layer");
-			return layerElement(innermost, { [INLINE_WRAPPER_STACK_ATTRIBUTE]: serializeInlineWrapperStack(stack) });
+			const attributes = { [INLINE_WRAPPER_STACK_ATTRIBUTE]: serializeInlineWrapperStack(stack) };
+			if (typeof _docxHyperlinkIndex === "number" && typeof _docxInsideHyperlinkStackStart === "number") attributes[INLINE_WRAPPER_HYPERLINK_ORIGIN_ATTRIBUTE] = `${_docxHyperlinkIndex}:${_docxInsideHyperlinkStackStart}`;
+			return layerElement(innermost, attributes);
 		}
 	}
 });

package/dist/prosemirror/extensions/nodes/CommentReferenceExtension.js

@@ -13,11 +13,15 @@ const surveyCommentReferences = (doc) => {
 	doc.descendants((node, position) => {
 		if (node.type.name === "commentReference") {
 			const attrs = readCommentReferenceAttrs(node);
-			references.push({
-				commentId: attrs.ok ? attrs.value.commentId : -1,
+			references.push(attrs.ok ? {
+				status: "valid",
+				commentId: attrs.value.commentId,
 				position,
-				size: node.nodeSize,
-				malformed: !attrs.ok
+				size: node.nodeSize
+			} : {
+				status: "malformed",
+				position,
+				size: node.nodeSize
 			});
 			return false;
 		}
@@ -60,7 +64,7 @@ const CommentReferenceExtension = createNodeExtension({
 			tag: "span[data-docx-comment-reference]",
 			getAttrs(dom) {
 				const raw = dom.getAttribute("data-docx-comment-reference");
-				if (raw === null || !/^(?:0|[1-9]\d*)$/.test(raw)) return false;
+				if (raw === null || !/^-?(?:0|[1-9]\d*)$/.test(raw)) return false;
 				const commentId = Number(raw);
 				return Number.isSafeInteger(commentId) ? { commentId } : false;
 			}

package/dist/prosemirror/extensions/nodes/TableExtension.js

@@ -367,7 +367,7 @@ const statedCellWidth = (value, type) => ({
 	}
 });
 const tableCellSpec = {
-	content: "(paragraph | table | textBox | preservedBlock | blockBookmarkBoundary)+",
+	content: "(paragraph | table | textBox | blockSdt | preservedBlock | blockBookmarkBoundary)+",
 	tableRole: "cell",
 	isolating: true,
 	attrs: {
@@ -436,7 +436,7 @@ const tableCellSpec = {
 	}
 };
 const tableHeaderSpec = {
-	content: "(paragraph | table | textBox | preservedBlock | blockBookmarkBoundary)+",
+	content: "(paragraph | table | textBox | blockSdt | preservedBlock | blockBookmarkBoundary)+",
 	tableRole: "header_cell",
 	isolating: true,
 	attrs: {

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

@@ -170,6 +170,17 @@ type InlineWrapperKind = InlineWrapperLayer["kind"];
  */
 type InlineWrapperAttrs = {
   stack: readonly InlineWrapperLayer[];
+  /**
+   * The imported hyperlink whose children the suffix of `stack` came from.
+   *
+   * ProseMirror stores marks as an unordered set, so a link mark and a wrapper
+   * mark otherwise cannot say whether `<w:bdo>` surrounded `<w:hyperlink>` or
+   * was one of its children. This is parser provenance, not editable wrapper
+   * data: it is meaningful only alongside the matching hyperlink mark.
+   */
+  _docxHyperlinkIndex?: number;
+  /** The first stack layer authored inside `_docxHyperlinkIndex`. */
+  _docxInsideHyperlinkStackStart?: number;
 };
 declare const COMPLEX_SCRIPT_RUN_PROPERTY_KEYS: readonly ["boldCs", "italicCs", "fontSizeCs"];
 type ComplexScriptRunPropertyKey = (typeof COMPLEX_SCRIPT_RUN_PROPERTY_KEYS)[number];

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

@@ -1,5 +1,5 @@
 import { document_d_exports } from "../../types/document.js";
-import { TrackedChangeProvenance } from "./marks.js";
+import { InlineWrapperLayer, TrackedChangeProvenance } from "./marks.js";
 import "../../types/index.js";
 import { OutlineStyleAttr } from "../../types/documentEnumValues.js";
 import { SpacingExplicit } from "../../types/formatting.js";
@@ -212,9 +212,9 @@ type ParagraphAttrs = {
     id: number;
     name: string;
   }[];
-  /** Empty `w:hyperlink` elements cannot be represented as text marks.
-   *  Preserve their relationship metadata at the paragraph boundary so a
-   *  no-edit DOCX round-trip does not silently drop hyperlink elements. */
+  /** A `w:hyperlink` with no projectable leaf cannot be represented as a text mark.
+   *  Preserve its metadata and any empty transparent-wrapper children at the
+   *  paragraph boundary so an editor round trip does not drop either element. */
   _emptyHyperlinks?: {
     /** ProseMirror inline offset where the zero-width hyperlink appeared. */
     offset: number;
@@ -225,6 +225,8 @@ type ParagraphAttrs = {
     target?: document_d_exports.Hyperlink["target"];
     history?: document_d_exports.Hyperlink["history"];
     docLocation?: document_d_exports.Hyperlink["docLocation"];
+    /** Empty transparent-wrapper nests authored as children of this link. */
+    _docxEmptyWrapperStacks?: readonly (readonly InlineWrapperLayer[])[];
   }[];
   /**
    * Run-in heading flag: this paragraph's mark carries

package/dist/prosemirror/trackedRunInlineAtoms.d.ts

@@ -16,7 +16,7 @@ declare const TRACKED_RUN_INLINE_ATOM_DISPOSITIONS: Readonly<{
   readonly hardBreak: "carry";
   readonly image: "carry";
   readonly math: "carry";
-  readonly moveRangeBoundary: "transparent";
+  readonly moveRangeBoundary: "carry";
   readonly pageBreakRun: "page-break-carrier";
   readonly preservedXml: "carry";
   readonly rangeAnchor: "transparent";

package/dist/prosemirror/trackedRunInlineAtoms.js

@@ -15,7 +15,7 @@ const TRACKED_RUN_INLINE_ATOM_DISPOSITIONS = Object.freeze({
 	hardBreak: "carry",
 	image: "carry",
 	math: "carry",
-	moveRangeBoundary: "transparent",
+	moveRangeBoundary: "carry",
 	pageBreakRun: "page-break-carrier",
 	preservedXml: "carry",
 	rangeAnchor: "transparent",

package/dist/prosemirror/validation.js

@@ -49,7 +49,7 @@ const validateBookmarkBoundaryStructure = (doc, issues) => {
 		const { id, name, path, paragraph, origin } = boundary;
 		const previousOrigin = startedBy.get(id);
 		if (previousOrigin !== void 0) {
-			if (origin === "attr" && previousOrigin === "attr") return false;
+			if (origin === "paragraph-attr" && previousOrigin === "paragraph-attr") return false;
 			issues.push({
 				path,
 				message: `${describeBookmark(id, name)} has more than one start boundary (${paragraph}).`
@@ -81,7 +81,7 @@ const validateBookmarkBoundaryStructure = (doc, issues) => {
 				name: bookmark.name,
 				path: bookmarkPath,
 				paragraph: enclosingParagraph,
-				origin: "attr"
+				origin: "paragraph-attr"
 			})) openedAttrBookmarks.push({
 				id: bookmark.id,
 				path: bookmarkPath
@@ -100,21 +100,62 @@ const validateBookmarkBoundaryStructure = (doc, issues) => {
 					name: attrs.name ?? null,
 					path,
 					paragraph: enclosingParagraph,
-					origin: "node"
+					origin: "boundary"
 				});
 				else registerEnd(attrs.id, path, enclosingParagraph);
 			}
 		}
+		let positionedBookmarks = [];
+		if (node.type.name === "table") {
+			const result = readTableAttrs(node);
+			if (result.ok) positionedBookmarks = result.value._bookmarks ?? [];
+		} else if (node.type.name === "tableRow") {
+			const result = readTableRowAttrs(node);
+			if (result.ok) positionedBookmarks = result.value._bookmarks ?? [];
+		}
+		const positionedBookmarksByChildIndex = /* @__PURE__ */ new Map();
+		for (const [index, positioned] of positionedBookmarks.entries()) {
+			const markerPath = `${path}.${node.type.name}.attrs._bookmarks[${index}]`;
+			if (positioned.index > node.childCount) {
+				issues.push({
+					path: `${markerPath}.index`,
+					message: `Expected a child position between 0 and ${node.childCount}.`
+				});
+				continue;
+			}
+			const markers = positionedBookmarksByChildIndex.get(positioned.index);
+			const atPosition = {
+				marker: positioned.marker,
+				path: markerPath
+			};
+			if (markers === void 0) positionedBookmarksByChildIndex.set(positioned.index, [atPosition]);
+			else markers.push(atPosition);
+		}
+		const visitPositionedBookmarks = (childIndex) => {
+			for (const { marker, path: markerPath } of positionedBookmarksByChildIndex.get(childIndex) ?? []) if (marker.type === "bookmarkStart") registerStart({
+				id: marker.id,
+				name: marker.name,
+				path: markerPath,
+				paragraph: enclosingParagraph,
+				origin: "positioned"
+			});
+			else if (open.has(marker.id)) registerEnd(marker.id, markerPath, enclosingParagraph);
+		};
 		node.forEach((child, _offset, index) => {
+			visitPositionedBookmarks(index);
 			visit(child, `${path}.content[${index}]`, enclosingParagraph);
 		});
+		visitPositionedBookmarks(node.childCount);
 		for (const { id, path: bookmarkPath } of openedAttrBookmarks) registerEnd(id, bookmarkPath, enclosingParagraph);
 	};
 	visit(doc, "doc", "the document root");
-	for (const boundary of open.values()) issues.push({
-		path: boundary.path,
-		message: `${describeBookmark(boundary.id, boundary.name)} has no matching end boundary (${boundary.paragraph}).`
-	});
+	for (const boundary of open.values()) {
+		if (boundary.origin === "positioned") continue;
+		issues.push({
+			path: boundary.path,
+			message: `${describeBookmark(boundary.id, boundary.name)} has no matching end boundary (${boundary.paragraph}).`
+		});
+	}
 };
 const assertValidProseMirrorDocument = (doc, context) => {
 	if (validDocumentCache.has(doc)) return;

package/dist/types/content.d.ts

@@ -1,2 +1,2 @@
-import { BlockContent, BlockSdt, BookmarkEnd, BookmarkStart, BreakContent, Column, Comment, CommentRangeEnd, CommentRangeStart, CommentReference, ComplexField, Deletion, DisplacedByCustomXml, DocumentBody, DrawingContent, DrawingRawXmlMode, EffectExtentSlots, Endnote, EndnotePosition, EndnoteProperties, Field, FieldCharContent, FieldType, FooterReference, Footnote, FootnotePosition, FootnoteProperties, HeaderFooter, HeaderFooterType, HeaderReference, Hyperlink, Image, ImageCrop, ImagePadding, ImagePosition, ImageSize, ImageTransform, ImageWrap, ImageWrapPolygon, InlineSdt, Insertion, InstrTextContent, LineNumberRestart, MathEquation, MoveFrom, MoveFromRangeEnd, MoveFromRangeStart, MoveTo, MoveToRangeEnd, MoveToRangeStart, NoBreakHyphenContent, NoteNumberRestart, NoteReferenceContent, PageOrientation, Paragraph, ParagraphContent, ParagraphPropertyChange, PositionalTab, PositionedBookmarkMarker, PreservedAttribute, PreservedBlock, PreservedInline, PropertyChangeInfo, Run, RunContent, RunPropertyChange, SdtProperties, SdtType, Section, SectionProperties, SectionStart, Shape, ShapeContent, ShapeFill, ShapeGeometryAdjustment, ShapeOutline, ShapeTextBody, ShapeType, SimpleField, SoftHyphenContent, SymbolContent, TabContent, Table, TableCell, TableCellBlock, TableCellPropertyChange, TableRow, TableRowPropertyChange, TableStructuralChangeInfo, TextBox, TextContent, TrackedChangeInfo, TrackedRunChange, TrackedRunContent, VerticalAlign, WrapDistanceSlots } from "@stll/docx-core/model";
-export type { BlockContent, BlockSdt, BookmarkEnd, BookmarkStart, BreakContent, Column, Comment, CommentRangeEnd, CommentRangeStart, CommentReference, ComplexField, Deletion, DisplacedByCustomXml, DocumentBody, DrawingContent, DrawingRawXmlMode, EffectExtentSlots, Endnote, EndnotePosition, EndnoteProperties, Field, FieldCharContent, FieldType, FooterReference, Footnote, FootnotePosition, FootnoteProperties, HeaderFooter, HeaderFooterType, HeaderReference, Hyperlink, Image, ImageCrop, ImagePadding, ImagePosition, ImageSize, ImageTransform, ImageWrap, ImageWrapPolygon, InlineSdt, Insertion, InstrTextContent, LineNumberRestart, MathEquation, MoveFrom, MoveFromRangeEnd, MoveFromRangeStart, MoveTo, MoveToRangeEnd, MoveToRangeStart, NoBreakHyphenContent, NoteNumberRestart, NoteReferenceContent, PageOrientation, Paragraph, ParagraphContent, ParagraphPropertyChange, PositionalTab, PositionedBookmarkMarker, PreservedAttribute, PreservedBlock, PreservedInline, PropertyChangeInfo, Run, RunContent, RunPropertyChange, SdtProperties, SdtType, Section, SectionProperties, SectionStart, Shape, ShapeContent, ShapeFill, ShapeGeometryAdjustment, ShapeOutline, ShapeTextBody, ShapeType, SimpleField, SoftHyphenContent, SymbolContent, TabContent, Table, TableCell, TableCellBlock, TableCellPropertyChange, TableRow, TableRowPropertyChange, TableStructuralChangeInfo, TextBox, TextContent, TrackedChangeInfo, TrackedRunChange, TrackedRunContent, VerticalAlign, WrapDistanceSlots };
+import { BlockContent, BlockSdt, BookmarkEnd, BookmarkStart, BreakContent, Column, Comment, CommentRangeEnd, CommentRangeStart, CommentReference, ComplexField, Deletion, DisplacedByCustomXml, DocumentBackground, DocumentBackgroundDrawing, DocumentBody, DrawingContent, DrawingRawXmlMode, EffectExtentSlots, Endnote, EndnotePosition, EndnoteProperties, Field, FieldCharContent, FieldType, FooterReference, Footnote, FootnotePosition, FootnoteProperties, HeaderFooter, HeaderFooterType, HeaderReference, Hyperlink, Image, ImageCrop, ImagePadding, ImagePosition, ImageSize, ImageTransform, ImageWrap, ImageWrapPolygon, InlineSdt, Insertion, InstrTextContent, LineNumberRestart, MathEquation, MoveFrom, MoveFromRangeEnd, MoveFromRangeStart, MoveTo, MoveToRangeEnd, MoveToRangeStart, NoBreakHyphenContent, NoteNumberRestart, NoteReferenceContent, PageOrientation, Paragraph, ParagraphContent, ParagraphPropertyChange, PositionalTab, PositionedBookmarkMarker, PreservedAttribute, PreservedBlock, PreservedInline, PropertyChangeInfo, Run, RunContent, RunPropertyChange, SdtProperties, SdtType, Section, SectionProperties, SectionStart, Shape, ShapeContent, ShapeFill, ShapeGeometryAdjustment, ShapeOutline, ShapeTextBody, ShapeType, SimpleField, SoftHyphenContent, SymbolContent, TabContent, Table, TableCell, TableCellBlock, TableCellPropertyChange, TableRow, TableRowPropertyChange, TableStructuralChangeInfo, TextBox, TextContent, TrackedChangeInfo, TrackedRunChange, TrackedRunContent, VerticalAlign, WrapDistanceSlots } from "@stll/docx-core/model";
+export type { BlockContent, BlockSdt, BookmarkEnd, BookmarkStart, BreakContent, Column, Comment, CommentRangeEnd, CommentRangeStart, CommentReference, ComplexField, Deletion, DisplacedByCustomXml, DocumentBackground, DocumentBackgroundDrawing, DocumentBody, DrawingContent, DrawingRawXmlMode, EffectExtentSlots, Endnote, EndnotePosition, EndnoteProperties, Field, FieldCharContent, FieldType, FooterReference, Footnote, FootnotePosition, FootnoteProperties, HeaderFooter, HeaderFooterType, HeaderReference, Hyperlink, Image, ImageCrop, ImagePadding, ImagePosition, ImageSize, ImageTransform, ImageWrap, ImageWrapPolygon, InlineSdt, Insertion, InstrTextContent, LineNumberRestart, MathEquation, MoveFrom, MoveFromRangeEnd, MoveFromRangeStart, MoveTo, MoveToRangeEnd, MoveToRangeStart, NoBreakHyphenContent, NoteNumberRestart, NoteReferenceContent, PageOrientation, Paragraph, ParagraphContent, ParagraphPropertyChange, PositionalTab, PositionedBookmarkMarker, PreservedAttribute, PreservedBlock, PreservedInline, PropertyChangeInfo, Run, RunContent, RunPropertyChange, SdtProperties, SdtType, Section, SectionProperties, SectionStart, Shape, ShapeContent, ShapeFill, ShapeGeometryAdjustment, ShapeOutline, ShapeTextBody, ShapeType, SimpleField, SoftHyphenContent, SymbolContent, TabContent, Table, TableCell, TableCellBlock, TableCellPropertyChange, TableRow, TableRowPropertyChange, TableStructuralChangeInfo, TextBox, TextContent, TrackedChangeInfo, TrackedRunChange, TrackedRunContent, VerticalAlign, WrapDistanceSlots };

package/dist/types/index.d.ts

@@ -12,6 +12,8 @@ type ComplexField = document_d_exports.ComplexField;
 type ConditionalFormatStyle = document_d_exports.ConditionalFormatStyle;
 type DocDefaults = document_d_exports.DocDefaults;
 type Document = document_d_exports.Document;
+type DocumentBackground = document_d_exports.DocumentBackground;
+type DocumentBackgroundDrawing = document_d_exports.DocumentBackgroundDrawing;
 type DocumentBody = document_d_exports.DocumentBody;
 type DocxConformanceClass = document_d_exports.DocxConformanceClass;
 type DocxPackage = document_d_exports.DocxPackage;
@@ -115,4 +117,4 @@ type ThemeFont = document_d_exports.ThemeFont;
 type ThemeFontScheme = document_d_exports.ThemeFontScheme;
 type UnderlineStyle = document_d_exports.UnderlineStyle;
 type VerticalAlign = document_d_exports.VerticalAlign;
-export type { AbstractNumbering, BlockContent, BookmarkEnd, BookmarkStart, BorderSpec, BreakContent, CellMargins, ColorValue, Column, ComplexField, ConditionalFormatStyle, DocDefaults, Document, DocumentBody, DocxConformanceClass, DocxPackage, DrawingContent, DrawingRawXmlMode, EmbeddedFontRef, EmphasisMark, Endnote, EndnotePosition, EndnoteProperties, Field, FieldCharContent, FieldType, FloatingTableProperties, FontCharset, FontInfo, FontTable, FooterReference, Footnote, FootnotePosition, FootnoteProperties, HeaderFooter, HeaderFooterType, HeaderReference, Hyperlink, Image, ImageCrop, ImagePadding, ImagePosition, ImageSize, ImageTransform, ImageWrap, InstrTextContent, LevelLegacy, LevelOverride, LevelSuffix, LineNumberRestart, LineSpacingRule, ListLevel, ListRendering, MediaFile, NoBreakHyphenContent, NoteNumberRestart, NoteReferenceContent, NumberFormat, NumberingDefinitions, NumberingInstance, PageOrientation, Paragraph, ParagraphAlignment, ParagraphContent, ParagraphFormatting, PositionalTab, Relationship, RelationshipMap, RelationshipType, Run, RunContent, SchemeColorSlot, Section, SectionProperties, SectionStart, ShadingProperties, Shape, ShapeContent, ShapeFill, ShapeGeometryAdjustment, ShapeOutline, ShapeTextBody, ShapeType, SimpleField, SoftHyphenContent, Style, StyleDefinitions, StyleType, SymbolContent, TabContent, TabLeader, TabStop, TabStopAlignment, Table, TableBorders, TableCell, TableCellFormatting, TableFormatting, TableGridChange, TableLook, TableMeasurement, TableRow, TableRowFormatting, TableWidthType, TextBox, TextContent, TextEffect, TextFormatting, Theme, ThemeColor, ThemeColorScheme, ThemeColorValue, ThemeFont, ThemeFontScheme, UnderlineStyle, VerticalAlign };
+export type { AbstractNumbering, BlockContent, BookmarkEnd, BookmarkStart, BorderSpec, BreakContent, CellMargins, ColorValue, Column, ComplexField, ConditionalFormatStyle, DocDefaults, Document, DocumentBackground, DocumentBackgroundDrawing, DocumentBody, DocxConformanceClass, DocxPackage, DrawingContent, DrawingRawXmlMode, EmbeddedFontRef, EmphasisMark, Endnote, EndnotePosition, EndnoteProperties, Field, FieldCharContent, FieldType, FloatingTableProperties, FontCharset, FontInfo, FontTable, FooterReference, Footnote, FootnotePosition, FootnoteProperties, HeaderFooter, HeaderFooterType, HeaderReference, Hyperlink, Image, ImageCrop, ImagePadding, ImagePosition, ImageSize, ImageTransform, ImageWrap, InstrTextContent, LevelLegacy, LevelOverride, LevelSuffix, LineNumberRestart, LineSpacingRule, ListLevel, ListRendering, MediaFile, NoBreakHyphenContent, NoteNumberRestart, NoteReferenceContent, NumberFormat, NumberingDefinitions, NumberingInstance, PageOrientation, Paragraph, ParagraphAlignment, ParagraphContent, ParagraphFormatting, PositionalTab, Relationship, RelationshipMap, RelationshipType, Run, RunContent, SchemeColorSlot, Section, SectionProperties, SectionStart, ShadingProperties, Shape, ShapeContent, ShapeFill, ShapeGeometryAdjustment, ShapeOutline, ShapeTextBody, ShapeType, SimpleField, SoftHyphenContent, Style, StyleDefinitions, StyleType, SymbolContent, TabContent, TabLeader, TabStop, TabStopAlignment, Table, TableBorders, TableCell, TableCellFormatting, TableFormatting, TableGridChange, TableLook, TableMeasurement, TableRow, TableRowFormatting, TableWidthType, TextBox, TextContent, TextEffect, TextFormatting, Theme, ThemeColor, ThemeColorScheme, ThemeColorValue, ThemeFont, ThemeFontScheme, UnderlineStyle, VerticalAlign };

package/dist/utils/mergeDocumentContent.js

@@ -92,12 +92,6 @@ function remapBlock(block, numIdRemap, abstractNumIdRemap) {
 	};
 	return block;
 }
-/** A cell holds no content control, so the walk stays inside its own union. */
-function remapCellBlock(block, numIdRemap, abstractNumIdRemap) {
-	if (block.type === "paragraph") return remapParagraph(block, numIdRemap, abstractNumIdRemap);
-	if (block.type === "table") return remapTable(block, numIdRemap, abstractNumIdRemap);
-	return block;
-}
 function remapTable(table, numIdRemap, abstractNumIdRemap) {
 	return {
 		...table,
@@ -105,7 +99,7 @@ function remapTable(table, numIdRemap, abstractNumIdRemap) {
 			...row,
 			cells: row.cells.map((cell) => ({
 				...cell,
-				content: cell.content.map((item) => remapCellBlock(item, numIdRemap, abstractNumIdRemap))
+				content: cell.content.map((item) => remapBlock(item, numIdRemap, abstractNumIdRemap))
 			}))
 		}))
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.47.3",
+  "version": "0.47.5",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",
@@ -128,7 +128,7 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.25.2",
+    "@stll/docx-core": "^0.25.3",
     "@stll/docx-utils": "^0.1.0",
     "@stll/template-conditions": ">=0.4.0 <1.0.0",
     "better-result": "3.0.1",