@stll/folio-core 0.64.1 → 0.66.0

package/dist/markdown/countParagraphList.d.ts

@@ -0,0 +1,18 @@
+import { document_d_exports } from "../types/document.js";
+import { RenderContext } from "./types.js";
+export type CountedParagraphList = {
+  /**
+   * The list the paragraph shows: its own numbering's, or, while a pending
+   * property change removed it, the one that numbering showed.
+   */
+  visibleList: document_d_exports.ListRendering | undefined;
+  /** The label the counter gave the paragraph; absent when it shows none. */
+  label: string | undefined;
+};
+export declare function countParagraphList(ctx: RenderContext, pkg: document_d_exports.DocxPackage | undefined, para: document_d_exports.Paragraph): CountedParagraphList;
+/**
+ * Count the paragraphs of a text box Markdown does not write, cells
+ * included, in document order. A text box holds no text box, so the walk
+ * stops at each paragraph.
+ */
+export declare function countTextBoxLists(ctx: RenderContext, pkg: document_d_exports.DocxPackage | undefined, shape: document_d_exports.Shape): void;

package/dist/markdown/countParagraphList.js

@@ -0,0 +1,90 @@
+import { getCachedNumberingMap } from "../docx/numberingParser.js";
+import { BLOCK_TREE_DESCENT, visitBlockTreeRecords } from "../docx/paragraphTraversal.js";
+import { listLabelAttrsFromRendering } from "../prosemirror/listLabels.js";
+import { effectiveParagraphNumberingReference, paragraphNumberingAttr } from "../prosemirror/numberingAttr.js";
+import { resolveParagraphList } from "../prosemirror/paragraphList.js";
+// src/markdown/countParagraphList.ts
+/**
+* Advance the Markdown walk's list counter past one paragraph, as the page
+* counts it. Every paragraph the page counts, Markdown counts, whatever it
+* renders as and whether or not it writes it: the items after a numbered
+* heading continue from its number, and the paragraphs of a text box count
+* right after the paragraph the box is drawn in (where the page and the
+* content reader count them), although Markdown writes no text box.
+*/
+/** Explicit projection carried by canonical models that are not attached to a package. */
+const standaloneListRendering = (para) => para.listRendering;
+function countParagraphList(ctx, pkg, para) {
+	const inherited = ctx.paragraphNumbering(para.formatting?.styleId);
+	const inheritedReference = effectiveParagraphNumberingReference({
+		numPr: void 0,
+		numPrFromStyle: inherited
+	});
+	const sources = {
+		numPr: para.formatting?.numPr,
+		numPrFromStyle: para.formatting?.numPrFromStyle
+	};
+	const numbering = pkg?.numbering ? getCachedNumberingMap(pkg.numbering) : null;
+	const resolvedList = resolveParagraphList({
+		...sources,
+		inheritedReference: inheritedReference ?? null
+	}, numbering, standaloneListRendering(para));
+	const resolvedRendering = resolvedList.kind === "marker" ? resolvedList.rendering : void 0;
+	const counterAttrs = listLabelAttrsFromRendering(resolvedRendering, {
+		...sources,
+		numPrFromStyle: resolvedList.kind === "none" ? void 0 : inherited ?? sources.numPrFromStyle
+	});
+	if (sources.numPr === void 0 && sources.numPrFromStyle !== void 0 && inheritedReference === void 0 && para.propertyChanges !== void 0 && para.propertyChanges.length > 0) counterAttrs.numPr = paragraphNumberingAttr({ kind: "none" });
+	if (para.pPrMark) counterAttrs.pPrMark = para.pPrMark;
+	let originalList;
+	if (para.propertyChanges && ctx.opts.trackedChanges !== "clean") counterAttrs._propertyChanges = para.propertyChanges.map(({ previousFormatting, ...change }) => {
+		if (!previousFormatting) return change;
+		const previousInherited = ctx.paragraphNumbering(previousFormatting.styleId);
+		const previousInheritedReference = effectiveParagraphNumberingReference({
+			numPr: void 0,
+			numPrFromStyle: previousInherited
+		});
+		const previousSources = {
+			numPr: previousFormatting.numPr,
+			numPrFromStyle: previousFormatting.numPrFromStyle
+		};
+		const previousList = resolveParagraphList({
+			...previousSources,
+			inheritedReference: previousInheritedReference ?? null
+		}, numbering);
+		const previousRendering = previousList.kind === "marker" ? previousList.rendering : void 0;
+		originalList ??= previousRendering;
+		const previousAttrs = listLabelAttrsFromRendering(previousRendering, {
+			...previousSources,
+			numPrFromStyle: previousList.kind === "none" ? void 0 : previousInherited ?? previousSources.numPrFromStyle
+		});
+		return {
+			...change,
+			previousFormatting: {
+				...previousFormatting,
+				...previousAttrs,
+				...previousAttrs.numPr === void 0 ? { numPr: null } : { numPr: previousAttrs.numPr },
+				...previousAttrs.numPrFromStyle === void 0 ? { numPrFromStyle: null } : { numPrFromStyle: previousAttrs.numPrFromStyle }
+			}
+		};
+	});
+	const countedList = ctx.nextListLabel(counterAttrs, resolvedRendering);
+	return {
+		visibleList: resolvedRendering ?? (sources.numPr?.kind === "levelOnly" ? void 0 : originalList),
+		label: countedList.kind === "marker" ? countedList.label : void 0
+	};
+}
+/**
+* Count the paragraphs of a text box Markdown does not write, cells
+* included, in document order. A text box holds no text box, so the walk
+* stops at each paragraph.
+*/
+function countTextBoxLists(ctx, pkg, shape) {
+	if (shape.textBody === void 0) return;
+	visitBlockTreeRecords(shape.textBody.content, (record) => {
+		if (record.type !== "paragraph") return BLOCK_TREE_DESCENT.descend;
+		countParagraphList(ctx, pkg, record);
+		return BLOCK_TREE_DESCENT.prune;
+	});
+}
+export { countParagraphList, countTextBoxLists };

package/dist/markdown/renderParagraph.js

@@ -1,8 +1,5 @@
 import { isQuoteStyle, resolveHeadingLevel } from "../docx/builtInStyles.js";
-import { getCachedNumberingMap } from "../docx/numberingParser.js";
-import { listLabelAttrsFromRendering } from "../prosemirror/listLabels.js";
-import { effectiveParagraphNumberingReference, paragraphNumberingAttr } from "../prosemirror/numberingAttr.js";
-import { resolveParagraphList } from "../prosemirror/paragraphList.js";
+import { countParagraphList } from "./countParagraphList.js";
 import { inlineBreaksToHtml } from "./escape.js";
 import { renderParagraphInline } from "./renderRuns.js";
 // src/markdown/renderParagraph.ts
@@ -21,8 +18,6 @@ import { renderParagraphInline } from "./renderRuns.js";
 */
 /** Markdown has six heading levels; Word has nine. */
 const MAX_MARKDOWN_HEADING_LEVEL = 6;
-/** Explicit projection carried by canonical models that are not attached to a package. */
-const standaloneListRendering = (para) => para.listRendering;
 /**
 * Render a paragraph and return the block text. No surrounding blank line: the
 * caller joins blocks.
@@ -37,61 +32,7 @@ function renderParagraph(ctx, pkg, para) {
 * does not define as prose, as every other reader reads them.
 */
 function renderParagraphBlock(ctx, pkg, para) {
-	const inherited = ctx.paragraphNumbering(para.formatting?.styleId);
-	const inheritedReference = effectiveParagraphNumberingReference({
-		numPr: void 0,
-		numPrFromStyle: inherited
-	});
-	const sources = {
-		numPr: para.formatting?.numPr,
-		numPrFromStyle: para.formatting?.numPrFromStyle
-	};
-	const numbering = pkg?.numbering ? getCachedNumberingMap(pkg.numbering) : null;
-	const resolvedList = resolveParagraphList({
-		...sources,
-		inheritedReference: inheritedReference ?? null
-	}, numbering, standaloneListRendering(para));
-	const resolvedRendering = resolvedList.kind === "marker" ? resolvedList.rendering : void 0;
-	const counterAttrs = listLabelAttrsFromRendering(resolvedRendering, {
-		...sources,
-		numPrFromStyle: resolvedList.kind === "none" ? void 0 : inherited ?? sources.numPrFromStyle
-	});
-	if (sources.numPr === void 0 && sources.numPrFromStyle !== void 0 && inheritedReference === void 0 && para.propertyChanges !== void 0 && para.propertyChanges.length > 0) counterAttrs.numPr = paragraphNumberingAttr({ kind: "none" });
-	if (para.pPrMark) counterAttrs.pPrMark = para.pPrMark;
-	let originalList;
-	if (para.propertyChanges && ctx.opts.trackedChanges !== "clean") counterAttrs._propertyChanges = para.propertyChanges.map(({ previousFormatting, ...change }) => {
-		if (!previousFormatting) return change;
-		const previousInherited = ctx.paragraphNumbering(previousFormatting.styleId);
-		const previousInheritedReference = effectiveParagraphNumberingReference({
-			numPr: void 0,
-			numPrFromStyle: previousInherited
-		});
-		const previousSources = {
-			numPr: previousFormatting.numPr,
-			numPrFromStyle: previousFormatting.numPrFromStyle
-		};
-		const previousList = resolveParagraphList({
-			...previousSources,
-			inheritedReference: previousInheritedReference ?? null
-		}, numbering);
-		const previousRendering = previousList.kind === "marker" ? previousList.rendering : void 0;
-		originalList ??= previousRendering;
-		const previousAttrs = listLabelAttrsFromRendering(previousRendering, {
-			...previousSources,
-			numPrFromStyle: previousList.kind === "none" ? void 0 : previousInherited ?? previousSources.numPrFromStyle
-		});
-		return {
-			...change,
-			previousFormatting: {
-				...previousFormatting,
-				...previousAttrs,
-				...previousAttrs.numPr === void 0 ? { numPr: null } : { numPr: previousAttrs.numPr },
-				...previousAttrs.numPrFromStyle === void 0 ? { numPrFromStyle: null } : { numPrFromStyle: previousAttrs.numPrFromStyle }
-			}
-		};
-	});
-	const countedList = ctx.nextListLabel(counterAttrs, resolvedRendering);
-	const label = countedList.kind === "marker" ? countedList.label : void 0;
+	const { visibleList, label } = countParagraphList(ctx, pkg, para);
 	const inline = renderParagraphInline(ctx, pkg, para.content, para.paraId);
 	const styleId = para.formatting?.styleId;
 	const headingLevel = markdownHeadingLevel(ctx, para);
@@ -108,7 +49,6 @@ function renderParagraphBlock(ctx, pkg, para) {
 			type: "paragraph"
 		};
 	}
-	const visibleList = resolvedRendering ?? (sources.numPr?.kind === "levelOnly" ? void 0 : originalList);
 	if (visibleList && label !== void 0) return renderListItem(ctx, visibleList, label, inline);
 	ctx.listIndentWidths = [];
 	if (isQuoteStyle(styleId, ctx.builtInStyles)) return {

package/dist/markdown/renderRuns.js

@@ -2,6 +2,7 @@ import { getHyperlinkRuns } from "../docx/hyperlinkParser.js";
 import { RELATIONSHIP_TYPES, resolveRelationshipIdOfType, resolveRelativePath } from "../docx/relsParser.js";
 import { decodeOoxmlSymbolCharacter } from "../utils/ooxmlSymbol.js";
 import { wrapComment, wrapDeletion, wrapInsertion, wrapMoveFrom, wrapMoveTo } from "./annotations.js";
+import { countTextBoxLists } from "./countParagraphList.js";
 import { escapeAltText, escapeInline, escapeLinkUrl } from "./escape.js";
 import { registerImage } from "./images.js";
 import { numberNoteReference, pushWarning } from "./internals.js";
@@ -251,7 +252,9 @@ function renderRunContent(ctx, pkg, content, paraId) {
 			pushWarning(ctx, `image rId=${item.image.rId ?? "(absent)"} not resolvable`);
 			break;
 		}
-		case "shape": pushWarning(ctx, "shape not representable in markdown");
+		case "shape":
+			countTextBoxLists(ctx, pkg, item.shape);
+			pushWarning(ctx, "shape not representable in markdown");
 	}
 	return out;
 }

package/dist/prosemirror/conversion/fromProseDoc.js

@@ -1972,7 +1972,7 @@ function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperl
 				currentTrackedChange = void 0;
 				return;
 			}
-			const { anchorId } = expectTextBoxAnchorAttrs(node);
+			const { anchorId, _docxRunFormatting: carried } = expectTextBoxAnchorAttrs(node);
 			if (textBoxAnchorMarkers.has(anchorId)) {
 				flushCurrentInline();
 				currentTrackedChange = void 0;
@@ -1986,8 +1986,10 @@ function extractParagraphContent(originalParagraph, _documentCounts, emptyHyperl
 					text: ""
 				}]
 			};
-			const formatting = getAtomRunFormattingFromMarks(node.marks, formattingContext);
-			if (formatting) marker.formatting = formatting;
+			if (carried === void 0) {
+				const formatting = getAtomRunFormattingFromMarks(node.marks, formattingContext);
+				if (formatting) marker.formatting = formatting;
+			} else if (Object.keys(carried).length > 0) marker.formatting = structuredClone(carried);
 			restoreRunRecord(marker, node.marks);
 			textBoxAnchorMarkers.set(anchorId, marker);
 			anchorRun = marker;

package/dist/prosemirror/conversion/toProseDoc.js

@@ -2180,7 +2180,10 @@ function convertRunContent({ content, marks, formatting, textBoxAnchors, authore
 			const shp = content.shape;
 			if (shp.textBody) {
 				const anchorId = textBoxAnchors?.get(shp);
-				return anchorId ? [schema.node("textBoxAnchor", { anchorId }).mark(marks)] : [];
+				return anchorId ? [schema.node("textBoxAnchor", {
+					anchorId,
+					_docxRunFormatting: { ...authoredFormatting }
+				}).mark(marks)] : [];
 			}
 			return [withRunBoundaryMarks(withAlternateContent(convertShape(shp, carriedRunFormatting(authoredFormatting)), replayableShapeAlternateContent(content), content.alternateContent), marks)];
 		}

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

@@ -19,7 +19,10 @@ const TextBoxAnchorExtension = createNodeExtension({
 		marks: "_",
 		atom: true,
 		selectable: false,
-		attrs: { anchorId: {} },
+		attrs: {
+			anchorId: {},
+			_docxRunFormatting: { default: null }
+		},
 		parseDOM: [{
 			tag: "span[data-docx-textbox-anchor]",
 			getAttrs(dom) {

package/dist/prosemirror/replacedAnnotations.d.ts

@@ -48,6 +48,12 @@ export declare const hasReplacedAnnotations: ({ carried, leading, trailing }: Re
  * replacement either.
  */
 export declare const surveyReplacedAnnotations: (doc: Node, from: number, to: number) => ReplacedAnnotations;
+/**
+ * {@link surveyReplacedAnnotations} over the span as it reads once accepted:
+ * what a replacement of it carries, which a direct edit of the same text
+ * carries too.
+ */
+export declare const surveyAcceptedReplacedAnnotations: (doc: Node, from: number, to: number) => ReplacedAnnotations;
 type AnnotatedReplacementOptions = {
   annotations: ReplacedAnnotations;
   /** The replacement's own inline content, already carrying its formatting. */

package/dist/prosemirror/replacedAnnotations.js

@@ -197,19 +197,21 @@ const NOTHING_REPLACED = {
 	trailing: []
 };
 const hasReplacedAnnotations = ({ carried, leading, trailing }) => carried.length > 0 || leading.length > 0 || trailing.length > 0;
-/**
-* The annotations carried by `[from, to)`. An anchor counts only when the
-* range covers it whole: a partially covered atom is not deleted by the
-* replacement either.
-*/
-const surveyReplacedAnnotations = (doc, from, to) => {
+const lendsMarks = (node, content) => {
+	switch (content) {
+		case "asWritten": return true;
+		case "asAccepted": return !node.marks.some(({ type }) => type.name === "deletion");
+		default: throw new Error(`Unhandled replaced content ${String(content)}`);
+	}
+};
+const surveyAnnotations = (doc, { from, to, content }) => {
 	if (to <= from) return NOTHING_REPLACED;
 	const carried = [];
 	const leading = [];
 	const trailing = [];
 	doc.nodesBetween(from, to, (node, position) => {
 		if (!node.isInline) return true;
-		for (const mark of node.marks) if (isCarried(mark) && !alreadyCarried(mark, carried)) carried.push(mark);
+		for (const mark of lendsMarks(node, content) ? node.marks : []) if (isCarried(mark) && !alreadyCarried(mark, carried)) carried.push(mark);
 		const placement = anchorPlacement(node);
 		if (placement === void 0 || position < from || position + node.nodeSize > to) return false;
 		(opensRange(node, placement) ? leading : trailing).push(node);
@@ -222,6 +224,26 @@ const surveyReplacedAnnotations = (doc, from, to) => {
 	};
 };
 /**
+* The annotations carried by `[from, to)`. An anchor counts only when the
+* range covers it whole: a partially covered atom is not deleted by the
+* replacement either.
+*/
+const surveyReplacedAnnotations = (doc, from, to) => surveyAnnotations(doc, {
+	from,
+	to,
+	content: "asWritten"
+});
+/**
+* {@link surveyReplacedAnnotations} over the span as it reads once accepted:
+* what a replacement of it carries, which a direct edit of the same text
+* carries too.
+*/
+const surveyAcceptedReplacedAnnotations = (doc, from, to) => surveyAnnotations(doc, {
+	from,
+	to,
+	content: "asAccepted"
+});
+/**
 * Whether the span already contributed this mark, or one the mark would evict.
 * Comments do not exclude each other, so every comment is collected; a
 * hyperlink excludes its own type, so the first address in the span wins
@@ -476,4 +498,4 @@ const inheritedReplacementMarks = (doc, from, to) => {
 	const $from = doc.resolve(from);
 	return (to === from ? $from.marks() : $from.marksAcross(doc.resolve(to))) ?? Mark.none;
 };
-export { NON_INCLUSIVE_MARK_DISPOSITION, addCarriedMarks, annotatedReplacement, commentPoint, commentsAcrossBlockBoundary, commentsForTrackedInsertion, createResolvedCommentPointCollector, hasReplacedAnnotations, inheritedReplacementMarks, joinCommentStretches, nonInclusiveMarkNames, placeTrackedInsertion, resolvedCommentPoints, surveyReplacedAnnotations };
+export { NON_INCLUSIVE_MARK_DISPOSITION, addCarriedMarks, annotatedReplacement, commentPoint, commentsAcrossBlockBoundary, commentsForTrackedInsertion, createResolvedCommentPointCollector, hasReplacedAnnotations, inheritedReplacementMarks, joinCommentStretches, nonInclusiveMarkNames, placeTrackedInsertion, resolvedCommentPoints, surveyAcceptedReplacedAnnotations, surveyReplacedAnnotations };

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

@@ -969,6 +969,13 @@ export type TextBoxAttrs = {
 /** Internal inline position marker for an extracted text box block. */
 export type TextBoxAnchorAttrs = {
   anchorId: string;
+  /**
+   * The `w:rPr` of the run the text box came from, possibly empty. The
+   * anchor's formatting marks are rendered in the paragraph's style cascade
+   * and are not rebased when the paragraph is restyled, so the save writes
+   * this instead. Absent on an anchor not read from a package.
+   */
+  _docxRunFormatting?: document_d_exports.TextFormatting;
 };
 /**
  * Table node attributes

package/dist/prosemirror/textBoxAnchorAttrs.js

@@ -12,13 +12,21 @@ const readTextBoxAnchorAttrs = (node) => {
 		path: "textBoxAnchor.attrs.anchorId",
 		message: "Expected a non-empty string."
 	});
+	const runFormatting = node.attrs["_docxRunFormatting"];
+	if (runFormatting !== null && runFormatting !== void 0 && (typeof runFormatting !== "object" || Array.isArray(runFormatting))) issues.push({
+		path: "textBoxAnchor.attrs._docxRunFormatting",
+		message: "Expected run formatting or null."
+	});
 	if (issues.length > 0 || typeof anchorId !== "string") return {
 		ok: false,
 		issues
 	};
 	return {
 		ok: true,
-		value: { anchorId }
+		value: runFormatting === null || runFormatting === void 0 ? { anchorId } : {
+			anchorId,
+			_docxRunFormatting: runFormatting
+		}
 	};
 };
 const expectTextBoxAnchorAttrs = (node) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stll/folio-core",
-  "version": "0.64.1",
+  "version": "0.66.0",
   "description": "Headless, framework-neutral core of folio: the OOXML (.docx) parser, document model, ProseMirror integration, and page-layout engine. No React.",
   "keywords": [
     "document-model",
@@ -171,16 +171,14 @@
     "perf": "bun scripts/profile-editor.ts"
   },
   "dependencies": {
-    "@stll/docx-core": "^0.39.2",
+    "@stll/docx-core": "^0.41.0",
     "@stll/docx-utils": "^0.2.0",
     "@stll/template-conditions": "^0.6.2",
-    "@stll/utf8-boundaries": "0.1.2",
+    "@stll/utf8-boundaries": "0.2.0",
     "better-result": "3.0.1",
     "csstype": "^3.1.3",
     "dompurify": "^3.4.17",
-    "fast-xml-parser": "^5.11.2",
     "hyphen": "1.14.1",
-    "jszip": "3.10.2",
     "utif2": "^4.1.0",
     "valibot": "1.5.0"
   },

package/dist/docx/streamingXmlParser.d.ts

@@ -1,60 +0,0 @@
-import { XmlElement, XmlNamespaceScope } from "./xmlParser.js";
-type ParseXmlResult = {
-  status: "parsed";
-  value: XmlElement;
-} | {
-  status: "unsupported";
-};
-type XmlSourceRange = {
-  readonly start: number;
-  readonly end: number;
-};
-/** Exact element source ranges, available only from the opt-in source-range reader. */
-export declare const getXmlSourceRange: (element: XmlElement) => XmlSourceRange | undefined;
-/**
- * Parse ordinary OOXML into Folio's existing element representation in one
- * pass. Unsupported or malformed constructs return a sentinel so callers can
- * retain the general-purpose parser as a compatibility fallback.
- */
-type AttributeValueSpan = {
-  start: number;
-  end: number;
-};
-type OpenTagVisitor = (element: XmlElement, attributeValueSpans: ReadonlyMap<string, AttributeValueSpan>) => ReadonlyMap<string, string> | null;
-type OpenTagScanVisitor = (...args: Parameters<OpenTagVisitor>) => null;
-type ElementScanOptions = {
-  element: XmlElement;
-  attributeValueSpans: ReadonlyMap<string, AttributeValueSpan>;
-  nameEnd: number;
-  parent: XmlElement | undefined;
-};
-type ElementScanVisitor = (options: ElementScanOptions) => void;
-/**
- * @param inheritedNamespaceScope the bindings in scope around `xml`, for a
- *   fragment captured out of a part whose root declared them.
- */
-export declare const parseStreamingXml: (xml: string, inheritedNamespaceScope?: XmlNamespaceScope) => ParseXmlResult;
-/** Retain source spans for every element without changing the parsed namespace tree. */
-export declare const parseStreamingXmlWithSourceRanges: (xml: string, inheritedNamespaceScope?: XmlNamespaceScope) => ParseXmlResult;
-/** Retain the body tree while collecting identities for import repair. */
-export declare const parseStreamingXmlWithIdentityVisitor: (xml: string, visitOpenTag: OpenTagScanVisitor) => ParseXmlResult;
-/** Rewrite selected decimal attribute values while preserving every other source byte. */
-export declare const rewriteStreamingXmlDecimalAttributes: (xml: string, visitOpenTag: OpenTagVisitor) => {
-  status: "rewritten";
-  value: string;
-} | {
-  status: "unsupported";
-};
-/** Visit identity attributes and namespace bindings without building an XML tree. */
-export declare const scanStreamingXmlNumericIdAttributes: (xml: string, visitOpenTag: OpenTagScanVisitor) => {
-  status: "unsupported";
-} | {
-  status: "scanned";
-};
-/** Visit namespace-resolved start tags and source spans without building a tree. */
-export declare const scanStreamingXmlElements: (xml: string, visitElement: ElementScanVisitor) => {
-  status: "unsupported";
-} | {
-  status: "scanned";
-};
-export {};