@stll/folio-core 0.54.2 → 0.55.0

package/dist/docx/packageParts.js

@@ -1,5 +1,30 @@
-import { resolveRelativePath } from "./relsParser.js";
+import { Result } from "better-result";
 //#region src/docx/packageParts.ts
+/**
+* What a repack carries out of the source package, and the guarantee that
+* nothing in the output points at a part the output does not hold.
+*
+* A `.docx` is an OPC package: `[Content_Types].xml` declares every part in it
+* and the `.rels` parts wire them together. Folio models a handful of those
+* parts (the document body, headers, footers, notes, numbering, styles,
+* comments) and rewrites them on save. Everything else — embedded objects,
+* media, custom XML, fonts, charts, macro projects, parts folio has never heard
+* of — belongs to the author, and a repack hands it back byte for byte.
+*
+* Folio never executes document content and never removes it. The document is
+* the user's; the only thing a save refuses is a package path that would let
+* the archive escape its own directory when a host writes it out, which is a
+* property of the package structure rather than of the content. A macro-enabled
+* document therefore stays macro-enabled, main-part content type included:
+* silently handing back a `.docm` stripped of its project is data loss dressed
+* up as safety.
+*
+* A refused path loses its relationships and its content-type override with it.
+* That is the invariant this module exists for: Word and LibreOffice both
+* refuse a package whose `document.xml.rels` points at nothing, so a repack
+* that removes a part without removing its references produces a file that
+* does not open.
+*/
 const CONTENT_TYPE_ELEMENT = /<(?:Default|Override)\b[^>]*?\/?>/giu;
 const PART_NAME_ATTRIBUTE = /\bPartName\s*=\s*(?<quote>["'])(?<value>[^"']*)\k<quote>/u;
 const RELATIONSHIP_ELEMENT = /<Relationship\b[^>]*?(?:\/>|>\s*<\/Relationship>)/giu;
@@ -24,12 +49,38 @@ const owningPartPath = (relsPath) => {
 };
 /** Normalize a package path for comparison: lower case, no leading slash. */
 const normalizePartPath = (path) => (path.startsWith("/") ? path.slice(1) : path).toLowerCase();
-/**
-* Decode `%XX` escapes in a part name. `decodeURI` throws on a malformed
-* escape, and a malformed target is exactly the input this has to survive, so
-* the replacement is done by hand.
-*/
-const decodePartName = (name) => name.replaceAll(/%[0-9A-Fa-f]{2}/gu, (escape) => String.fromCharCode(Number.parseInt(escape.slice(1), 16)));
+/** Decode URI escapes as UTF-8; malformed references cannot name a part. */
+const decodePartName = (name) => {
+	const decoded = Result.try({
+		try: () => decodeURIComponent(name),
+		catch: () => void 0
+	});
+	return decoded.isOk() ? decoded.value : void 0;
+};
+/** Resolve an internal URI reference once, before comparing it with ZIP entries. */
+const resolvePackageRelationshipTarget = (target, relsPath) => {
+	const fragment = target.indexOf("#");
+	if (fragment === 0) {
+		const owner = owningPartPath(relsPath);
+		return owner === void 0 ? void 0 : normalizePartPath(owner);
+	}
+	const reference = fragment > 0 ? target.slice(0, fragment) : target;
+	if (!reference || reference.startsWith("//") || /[\\?:]/u.test(reference)) return void 0;
+	const owner = owningPartPath(relsPath);
+	const segments = reference.startsWith("/") || owner === void 0 ? [] : owner.split("/").slice(0, -1);
+	for (const encoded of reference.split("/")) {
+		const segment = decodePartName(encoded);
+		if (segment === void 0 || /[/\\]/u.test(segment) || segment.includes(String.fromCharCode(0))) return void 0;
+		if (segment === "" || segment === ".") continue;
+		if (segment === "..") {
+			if (segments.pop() === void 0) return void 0;
+			continue;
+		}
+		segments.push(segment);
+	}
+	const path = normalizePartPath(segments.join("/"));
+	return isUnsafePackagePath(path) ? void 0 : path;
+};
 /**
 * Whether an entry path would escape the package when a host writes the archive
 * to disk: absolute, backslash-separated, or climbing out through `..`. This is
@@ -53,15 +104,13 @@ const presentPartPaths = (zip) => {
 	for (const [path, file] of Object.entries(zip.files)) if (!file.dir) present.add(normalizePartPath(path));
 	return present;
 };
-const isPresent = (present, partPath) => present.has(normalizePartPath(partPath)) || present.has(normalizePartPath(decodePartName(partPath)));
+const isPresent = (present, partPath) => present.has(normalizePartPath(partPath)) || present.has(normalizePartPath(decodePartName(partPath) ?? ""));
 /** The part a relationship names, or null when it points outside the package. */
 const relationshipTarget = (element, relsPath) => {
 	if (TARGET_MODE_ATTRIBUTE.exec(element)?.groups?.["value"] === "External") return null;
 	const target = TARGET_ATTRIBUTE.exec(element)?.groups?.["value"];
 	if (target === void 0) return null;
-	const fragment = target.indexOf("#");
-	if (fragment === 0) return owningPartPath(relsPath) ?? "";
-	return resolveRelativePath(relsPath, fragment > 0 ? target.slice(0, fragment) : target);
+	return resolvePackageRelationshipTarget(target, relsPath) ?? "";
 };
 /**
 * Every `.rels` part with its text. Read one at a time rather than through
@@ -107,8 +156,8 @@ const reconcilePackageReferences = async (zip, compressionLevel) => {
 		let dropped = false;
 		const pruned = xml.replaceAll(RELATIONSHIP_ELEMENT, (element) => {
 			const target = relationshipTarget(element, path);
-			if (target === null || isPresent(present, target)) return element;
-			repair.danglingRelationships.push(target);
+			if (target === null || present.has(target)) return element;
+			repair.danglingRelationships.push(target || TARGET_ATTRIBUTE.exec(element)?.groups?.["value"] || "");
 			dropped = true;
 			const id = RELATIONSHIP_ID_ATTRIBUTE.exec(element)?.groups?.["value"];
 			const owningPart = owningPartPath(path);
@@ -154,7 +203,7 @@ const reconcilePackageReferences = async (zip, compressionLevel) => {
 	const prunedContentTypes = (await contentTypes.async("text")).replaceAll(CONTENT_TYPE_ELEMENT, (element) => {
 		const partName = PART_NAME_ATTRIBUTE.exec(element)?.groups?.["value"];
 		if (partName === void 0 || isPresent(present, partName)) return element;
-		repair.danglingOverrides.push(normalizePartPath(decodePartName(partName)));
+		repair.danglingOverrides.push(normalizePartPath(decodePartName(partName) ?? partName));
 		droppedOverride = true;
 		return "";
 	});
@@ -195,7 +244,7 @@ const checkPackageIntegrity = async (zip) => {
 			const id = RELATIONSHIP_ID_ATTRIBUTE.exec(element)?.groups?.["value"];
 			if (id !== void 0) ids.add(id);
 			const target = relationshipTarget(element, path);
-			if (target !== null && !isPresent(present, target)) report.danglingRelationshipTargets.push(`${path}|${target}`);
+			if (target !== null && !present.has(target)) report.danglingRelationshipTargets.push(`${path}|${target || TARGET_ATTRIBUTE.exec(element)?.groups?.["value"] || ""}`);
 		}
 		if (owningPart !== void 0) idsByOwningPart.set(owningPart, ids);
 	}
@@ -211,4 +260,4 @@ const checkPackageIntegrity = async (zip) => {
 	return report;
 };
 //#endregion
-export { checkPackageIntegrity, isUnsafePackagePath, reconcilePackageReferences, removeUnsafeEntries };
+export { checkPackageIntegrity, isUnsafePackagePath, reconcilePackageReferences, removeUnsafeEntries, resolvePackageRelationshipTarget };

package/dist/docx/paragraphMarkPropertyPresence.d.ts

@@ -0,0 +1,9 @@
+import { document_d_exports } from "../types/document.js";
+import { XmlElement } from "./xmlParser.js";
+//#region src/docx/paragraphMarkPropertyPresence.d.ts
+declare const EMPTY_MARK_PROPERTIES_ATTRIBUTE = "emptyMarkProperties";
+/** A paragraph-owned rPr carrier cannot distinguish absent and explicitly empty formatting. */
+declare const serializeEmptyMarkProperties: (paragraph: document_d_exports.Paragraph) => string | undefined;
+declare const restoreEmptyMarkProperties: (paragraph: document_d_exports.Paragraph, element: XmlElement) => void;
+//#endregion
+export { EMPTY_MARK_PROPERTIES_ATTRIBUTE, restoreEmptyMarkProperties, serializeEmptyMarkProperties };

package/dist/docx/paragraphMarkPropertyPresence.js

@@ -0,0 +1,21 @@
+import { OOXML_NAMESPACES } from "./serializer/partNamespaces.js";
+import { getAttributeByNamespaceUri } from "./xmlParser.js";
+import { EMPTY_PROPERTY_SETS } from "@stll/docx-core/ops";
+//#region src/docx/paragraphMarkPropertyPresence.ts
+const EMPTY_MARK_PROPERTIES_ATTRIBUTE = "emptyMarkProperties";
+const REVIEW_HISTORY_NAMESPACES = /* @__PURE__ */ new Set([OOXML_NAMESPACES.folio.uri]);
+/** A paragraph-owned rPr carrier cannot distinguish absent and explicitly empty formatting. */
+const serializeEmptyMarkProperties = (paragraph) => {
+	const properties = paragraph.formatting?.runProperties;
+	if (!(paragraph.pPrMark !== void 0 || paragraph.formatting?.runInWithNext !== void 0) || properties === void 0 || Object.keys(properties).length !== 0) return void 0;
+	return `folio:${EMPTY_MARK_PROPERTIES_ATTRIBUTE}="${EMPTY_PROPERTY_SETS.KEEP}"`;
+};
+const restoreEmptyMarkProperties = (paragraph, element) => {
+	if (paragraph.pPrMark === void 0 && paragraph.formatting?.runInWithNext === void 0 || getAttributeByNamespaceUri(element, REVIEW_HISTORY_NAMESPACES, "emptyMarkProperties") !== EMPTY_PROPERTY_SETS.KEEP || paragraph.formatting?.runProperties !== void 0) return;
+	paragraph.formatting = {
+		...paragraph.formatting,
+		runProperties: {}
+	};
+};
+//#endregion
+export { EMPTY_MARK_PROPERTIES_ATTRIBUTE, restoreEmptyMarkProperties, serializeEmptyMarkProperties };

package/dist/docx/paragraphParser.js

@@ -5,6 +5,7 @@ import { CAPTURE, dispatchChildrenWithContext, ownedElsewhere, transitionalNames
 import { resolveDefaultParagraphStyle } from "./defaultParagraphStyle.js";
 import { parseFieldType } from "./fieldParser.js";
 import { fieldStateOf, parseFieldState } from "./fieldState.js";
+import { foldListNumberFields, isListNumberField, isListNumberGapMarker, isTabOnlyRun } from "./foldedListNumberFields.js";
 import { HYPERLINK_CHILD_HANDLERS, parseHyperlink as parseHyperlink$1, parseHyperlinkShell } from "./hyperlinkParser.js";
 import { isHyperlinkContent, isInlineSdtContent, isTrackedChangeWrapperChild } from "./inlineWrapperContent.js";
 import { inlineWrapperOf } from "./inlineWrapperParser.js";
@@ -13,10 +14,13 @@ import { counterFormatOf, markerAlignmentForLevel, markerFormattingFromLevel, nu
 import { mergeParagraphNumbering as mergeParagraphNumbering$1, paragraphNumberingReferenceId as paragraphNumberingReferenceId$1, resolveParagraphNumbering as resolveParagraphNumbering$1 } from "./numberingReference.js";
 import { paraIdAttribute, textIdAttribute } from "./paraIdAttribute.js";
 import { paraIdInRange } from "./paraIdRangeNormalization.js";
+import { EMPTY_MARK_PROPERTIES_ATTRIBUTE, restoreEmptyMarkProperties } from "./paragraphMarkPropertyPresence.js";
 import { parseParagraphProperties } from "./paragraphProperties.js";
 import { assignParagraphPropertySource } from "./paragraphPropertySource.js";
 import { preserveInlineChild, preserveRunChild, preservedInlineCapture } from "./preservedRunContent.js";
 import { standalonePreviewLedger } from "./previewBudget.js";
+import { FOLIO_REVIEW_HISTORY_NAMESPACE } from "./reviewHistoryNamespace.js";
+import { ReviewResolutionProvenanceError, parseParagraphMarkResolutionJoin, parseResolutionJoins } from "./reviewResolutionProvenance.js";
 import { consolidateParagraphContent } from "./runConsolidator.js";
 import { parseRun } from "./runParser.js";
 import { runHoldsPayload } from "./runPayload.js";
@@ -31,15 +35,10 @@ import { WORDPROCESSINGML_NAMESPACE_URIS, cloneElement, findChild, findChildByNa
 import { panic } from "better-result";
 import { PARAGRAPH_MARK_CHANGE_KINDS, REVIEW_CARRIERS } from "@stll/docx-core/model";
 //#region src/docx/paragraphParser.ts
-const FOLIO_REVIEW_HISTORY_NAMESPACES = /* @__PURE__ */ new Set(["urn:stella:folio:review-history:1"]);
+const FOLIO_REVIEW_HISTORY_NAMESPACES = /* @__PURE__ */ new Set([FOLIO_REVIEW_HISTORY_NAMESPACE]);
 /**
 * Extract plain text from a math element (recursive text content extraction)
 */
-function extractPlainText(runs) {
-	let out = "";
-	for (const run of runs) for (const c of run.content) if (c.type === "text") out += c.text;
-	return out;
-}
 function extractMathText(el) {
 	let text = "";
 	if (el.type === "text" && typeof el.text === "string") return el.text;
@@ -200,17 +199,20 @@ function parseParagraphMarkChange(pPr) {
 		const element = findChildByNamespaceUri(rPr, WORDPROCESSINGML_NAMESPACE_URIS, kind);
 		if (element) return {
 			kind,
-			info: parseTrackedChangeInfo(element)
+			info: parseTrackedChangeInfo(element),
+			...parseParagraphMarkResolutionJoin(element)
 		};
 	}
 }
-function pushTrackedChangeWrapper({ contents, type, info, content, preserveEmpty = false }) {
+function pushTrackedChangeWrapper({ contents, type, info, resolutionJoins, content, preserveEmpty = false }) {
 	if (content.length === 0 && !preserveEmpty) return;
+	const provenance = resolutionJoins === void 0 ? {} : { resolutionJoins };
 	if (type === "insertion") {
 		contents.push({
 			type: "insertion",
 			info,
-			content: [...content]
+			content: [...content],
+			...provenance
 		});
 		return;
 	}
@@ -218,7 +220,8 @@ function pushTrackedChangeWrapper({ contents, type, info, content, preserveEmpty
 		contents.push({
 			type: "deletion",
 			info,
-			content: [...content]
+			content: [...content],
+			...provenance
 		});
 		return;
 	}
@@ -226,22 +229,30 @@ function pushTrackedChangeWrapper({ contents, type, info, content, preserveEmpty
 		contents.push({
 			type: "moveFrom",
 			info,
-			content: [...content]
+			content: [...content],
+			...provenance
 		});
 		return;
 	}
 	contents.push({
 		type: "moveTo",
 		info,
-		content: [...content]
+		content: [...content],
+		...provenance
 	});
 }
-function pushTrackedChangeSegments({ contents, type, info, parsedContent }) {
+function pushTrackedChangeSegments({ contents, type, info, resolutionJoins, parsedContent }) {
+	if (resolutionJoins !== void 0 && parsedContent.some((item) => !isTrackedChangeWrapperChild(item))) throw new ReviewResolutionProvenanceError({
+		attribute: "resolutionJoins",
+		reason: "invalid",
+		message: "Tracked-resolution provenance cannot bind a fragmented imported wrapper."
+	});
 	if (!parsedContent.some(isTrackedChangeWrapperChild)) {
 		pushTrackedChangeWrapper({
 			contents,
 			type,
 			info,
+			resolutionJoins,
 			content: [],
 			preserveEmpty: true
 		});
@@ -258,6 +269,7 @@ function pushTrackedChangeSegments({ contents, type, info, parsedContent }) {
 			contents,
 			type,
 			info,
+			resolutionJoins,
 			content: segment
 		});
 		segment.length = 0;
@@ -267,6 +279,7 @@ function pushTrackedChangeSegments({ contents, type, info, parsedContent }) {
 		contents,
 		type,
 		info,
+		resolutionJoins,
 		content: segment
 	});
 }
@@ -679,6 +692,34 @@ const FIELD_INLINE_WRAPPER_HANDLERS = {
 	pPr: CAPTURE
 };
 /**
+* The `w:r` elements a complex field, or a run holding one tab, was read
+* from. A list paragraph draws its `LISTNUM` fields in the list marker and
+* keeps their markup in the content as it was read; these are where that
+* markup comes from.
+*/
+const fieldSourceElements = /* @__PURE__ */ new WeakMap();
+const tabRunSources = /* @__PURE__ */ new WeakMap();
+/**
+* Whether the content read so far ends in a list-number field whose markup is
+* kept, with nothing but range markers after it: the next tab is its tab.
+*/
+const followsListNumberField = (contents) => {
+	for (let index = contents.length - 1; index >= 0; index -= 1) {
+		const item = contents[index];
+		if (item === void 0 || isListNumberGapMarker(item)) continue;
+		return item.type === "complexField" && fieldSourceElements.has(item);
+	}
+	return false;
+};
+const sourceMarkupOf = (item) => {
+	if (item.type === "run") {
+		const element = tabRunSources.get(item);
+		return element ? captureVerbatimXml(element) : void 0;
+	}
+	const elements = fieldSourceElements.get(item);
+	return elements && elements.length > 0 ? elements.map((element) => captureVerbatimXml(element)).join("") : void 0;
+};
+/**
 * Whether the walk is currently inside some open field's code region — its
 * own `begin` has been read but not yet its `separate` — at any nesting
 * depth. `codeDepthStack` tracks every open field regardless of whether it
@@ -839,6 +880,7 @@ const PARAGRAPH_CONTENT_HANDLERS = {
 			scan.complexFieldCodeRuns = [];
 			scan.complexFieldResultRuns = [];
 			scan.complexFieldOpenRuns = [];
+			scan.complexFieldSourceRuns = [];
 			scan.complexFieldState = beginFieldState;
 			scan.complexFieldDataXml = beginFieldData ? captureVerbatimXml(beginFieldData) : void 0;
 			scan.complexFieldFallbackDisplay = beginFallbackDisplay;
@@ -849,6 +891,8 @@ const PARAGRAPH_CONTENT_HANDLERS = {
 		if (hasFieldEnd && scan.codeDepthStack.length > 0) scan.codeDepthStack.pop();
 		if (scan.inComplexField) {
 			scan.complexFieldOpenRuns.push(withOrphanFieldCharsPreserved(run, runElement));
+			if (commentReferenceId !== null || trackedContext === "deletion") scan.complexFieldSourceRuns = null;
+			else scan.complexFieldSourceRuns?.push(runElement);
 			if (instrText) scan.complexFieldInstr += instrText;
 			if ((!scan.complexFieldFormatting || Object.keys(scan.complexFieldFormatting).length === 0) && run.formatting && Object.keys(run.formatting).length > 0) scan.complexFieldFormatting = run.formatting;
 			let inFieldCodeRegion = !hasFieldBegin && !scan.afterSeparator;
@@ -897,6 +941,7 @@ const PARAGRAPH_CONTENT_HANDLERS = {
 				if (scan.complexFieldDataXml !== void 0) complexField.formFieldDataXml = scan.complexFieldDataXml;
 				if (resultIsFallback) complexField.fieldResultIsFallback = true;
 				if (scan.complexFieldFormatting) complexField.formatting = scan.complexFieldFormatting;
+				if (scan.complexFieldSourceRuns !== null && isListNumberField(complexField)) fieldSourceElements.set(complexField, scan.complexFieldSourceRuns);
 				contents.push(complexField);
 				if (commentReferenceId !== null) contents.push({
 					type: "commentReference",
@@ -926,7 +971,11 @@ const PARAGRAPH_CONTENT_HANDLERS = {
 			runElement,
 			rels,
 			media
-		})) contents.push(withOrphanFieldCharsPreserved(run, runElement));
+		})) {
+			const kept = withOrphanFieldCharsPreserved(run, runElement);
+			if (isTabOnlyRun(kept) && trackedContext !== "deletion" && followsListNumberField(contents)) tabRunSources.set(kept, runElement);
+			contents.push(kept);
+		}
 	},
 	hyperlink: (child, { contents, styles, theme, rels, media, previews, inScopeXmlns }) => {
 		contents.push(...parseHyperlinkParagraphContents(child, rels, styles, theme, media, inScopeXmlns, previews));
@@ -983,35 +1032,47 @@ const PARAGRAPH_CONTENT_HANDLERS = {
 		}
 	},
 	ins: (child, { contents, styles, theme, rels, media, previews, inScopeXmlns }) => {
+		const insInfo = parseTrackedChangeInfo(child);
+		const insContent = parseParagraphContents(child, styles, theme, null, rels, media, previews, "default", inScopeXmlns);
 		pushTrackedChangeSegments({
 			contents,
 			type: "insertion",
-			info: parseTrackedChangeInfo(child),
-			parsedContent: parseParagraphContents(child, styles, theme, null, rels, media, previews, "default", inScopeXmlns)
+			info: insInfo,
+			resolutionJoins: parseResolutionJoins(child),
+			parsedContent: insContent
 		});
 	},
 	del: (child, { contents, styles, theme, rels, media, previews, inScopeXmlns }) => {
+		const delInfo = parseTrackedChangeInfo(child);
+		const delContent = parseParagraphContents(child, styles, theme, null, rels, media, previews, "deletion", inScopeXmlns);
 		pushTrackedChangeSegments({
 			contents,
 			type: "deletion",
-			info: parseTrackedChangeInfo(child),
-			parsedContent: parseParagraphContents(child, styles, theme, null, rels, media, previews, "deletion", inScopeXmlns)
+			info: delInfo,
+			resolutionJoins: parseResolutionJoins(child),
+			parsedContent: delContent
 		});
 	},
 	moveFrom: (child, { contents, styles, theme, rels, media, previews, inScopeXmlns }) => {
+		const moveFromInfo = parseTrackedChangeInfo(child);
+		const moveFromContent = parseParagraphContents(child, styles, theme, null, rels, media, previews, "deletion", inScopeXmlns);
 		pushTrackedChangeSegments({
 			contents,
 			type: "moveFrom",
-			info: parseTrackedChangeInfo(child),
-			parsedContent: parseParagraphContents(child, styles, theme, null, rels, media, previews, "deletion", inScopeXmlns)
+			info: moveFromInfo,
+			resolutionJoins: parseResolutionJoins(child),
+			parsedContent: moveFromContent
 		});
 	},
 	moveTo: (child, { contents, styles, theme, rels, media, previews, inScopeXmlns }) => {
+		const moveToInfo = parseTrackedChangeInfo(child);
+		const moveToContent = parseParagraphContents(child, styles, theme, null, rels, media, previews, "default", inScopeXmlns);
 		pushTrackedChangeSegments({
 			contents,
 			type: "moveTo",
-			info: parseTrackedChangeInfo(child),
-			parsedContent: parseParagraphContents(child, styles, theme, null, rels, media, previews, "default", inScopeXmlns)
+			info: moveToInfo,
+			resolutionJoins: parseResolutionJoins(child),
+			parsedContent: moveToContent
 		});
 	},
 	smartTag: paragraphInlineWrapper("smartTag"),
@@ -1068,6 +1129,7 @@ function parseParagraphContents(paraElement, styles, theme, _numbering, rels, me
 		complexFieldCodeRuns: [],
 		complexFieldResultRuns: [],
 		complexFieldOpenRuns: [],
+		complexFieldSourceRuns: null,
 		afterSeparator: false,
 		complexFieldState: {},
 		complexFieldDataXml: void 0,
@@ -1116,7 +1178,8 @@ function getCommentReferenceId(runElement) {
 const PARAGRAPH_ATTRIBUTES = /* @__PURE__ */ new Set([
 	"paraId",
 	"textId",
-	"reviewCarrier"
+	"reviewCarrier",
+	EMPTY_MARK_PROPERTIES_ATTRIBUTE
 ]);
 /**
 * Parse a paragraph element (w:p)
@@ -1158,8 +1221,10 @@ function parseParagraph(node, styles, theme, numbering, rels = null, media = nul
 		const sectPr = findChild(pPr, "w", "sectPr");
 		if (sectPr) paragraph.sectionProperties = parseSectionProperties(sectPr);
 	}
+	restoreEmptyMarkProperties(paragraph, node);
 	const rawContent = parseParagraphContents(node, styles, theme, numbering, rels, media, options?.previews ?? standalonePreviewLedger(), "default", options?.rootXmlns ?? {});
-	paragraph.content = options?.runConsolidation === "deferred" ? rawContent : consolidateParagraphContent(rawContent);
+	const consolidated = (content) => options?.runConsolidation === "deferred" ? content : consolidateParagraphContent(content);
+	paragraph.content = consolidated(rawContent);
 	const paragraphFormatting = paragraph.formatting;
 	const directNumPr = paragraphFormatting?.numPr;
 	const styleNumPr = paragraphFormatting?.styleId && styles ? styles.get(paragraphFormatting.styleId)?.pPr?.numPr : void 0;
@@ -1206,41 +1271,23 @@ function parseParagraph(node, styles, theme, numbering, rels = null, media = nul
 				if (markerAlignment !== void 0) listRendering.markerAlignment = markerAlignment;
 				if (level.suffix) listRendering.markerSuffix = level.suffix;
 				if (level.pPr?.tabs?.length) listRendering.levelTabs = level.pPr.tabs;
-				let implicitChildLevelAdvances = 0;
-				const foldedMarkerSuffix = [];
-				const filteredContent = [];
-				let dropNextTab = false;
-				const isMetadataContent = (content) => content.type === "bookmarkStart" || content.type === "bookmarkEnd" || content.type === "commentRangeStart" || content.type === "commentRangeEnd" || content.type === "commentReference";
-				for (const content of paragraph.content) {
-					if (dropNextTab && isMetadataContent(content)) {
-						filteredContent.push(content);
-						continue;
-					}
-					if (dropNextTab) {
-						dropNextTab = false;
-						if (content.type === "run" && content.content.length === 1 && content.content[0]?.type === "tab") continue;
-					}
-					if (content.type === "complexField") {
-						if (content.fieldType === "LISTNUM" || content.instruction.trim().toUpperCase().startsWith("LISTNUM")) {
-							implicitChildLevelAdvances += 1;
-							const cached = extractPlainText(content.fieldResult);
-							if (cached) foldedMarkerSuffix.push(cached);
-							dropNextTab = true;
-							continue;
-						}
-					}
-					filteredContent.push(content);
-				}
-				if (foldedMarkerSuffix.length > 0) {
-					paragraph.content = filteredContent;
-					listRendering.marker = `${listRendering.marker}\t${foldedMarkerSuffix.join(" ")}`;
+				const fold = rawContent.some((item) => item.type === "complexField") ? foldListNumberFields(rawContent, sourceMarkupOf) : {
+					content: rawContent,
+					cached: [],
+					fieldCount: 0
+				};
+				const markerShowsFields = !listRendering.isBullet && level.lvlText !== "" && !level.lvlText.includes("	");
+				if (fold.cached.length > 0 && markerShowsFields) {
+					paragraph.content = consolidated(fold.content);
+					listRendering.foldedMarkerSuffix = fold.cached.join(" ");
+					listRendering.marker = `${listRendering.marker}\t${listRendering.foldedMarkerSuffix}`;
 					const nextLevel = numbering.getLevel(numId, ilvl + 1);
 					if (nextLevel?.pPr?.hangingIndent === true && nextLevel.pPr.indentFirstLine !== void 0) {
 						const hangingTwips = -nextLevel.pPr.indentFirstLine;
 						if (hangingTwips > 0) listRendering.markerSecondSlotOffsetTwips = hangingTwips;
 					}
 				}
-				if (implicitChildLevelAdvances > 0) listRendering.implicitChildLevelAdvances = implicitChildLevelAdvances;
+				if (fold.fieldCount > 0) listRendering.implicitChildLevelAdvances = fold.fieldCount;
 				paragraph.listRendering = listRendering;
 				const styleInd = styleChainInd(paragraph.formatting?.styleId ?? (styles ? resolveDefaultParagraphStyle(styles.values())?.styleId : void 0), styles);
 				const chainInd = numPrFromStyle ? styleInd : {
@@ -1304,6 +1351,7 @@ const getRunContentText = (content) => {
 		case "fieldChar":
 		case "footnoteRef":
 		case "instrText":
+		case "noteMarker":
 		case "renderedPageBreak":
 		case "shape":
 		case "symbol": return "";

package/dist/docx/paragraphPropertySource.d.ts

@@ -43,6 +43,20 @@ declare const getProseDocumentParagraphPropertySourceContract: (document: Node)
 declare const getProseParagraphPropertySourceToken: (paragraph: Node) => unknown;
 declare const copyDocumentParagraphPropertySourceContract: (target: document_d_exports.Document, source: document_d_exports.Document) => void;
 declare const getParagraphPropertySourceToken: (paragraph: document_d_exports.Paragraph) => string | undefined;
+type ParagraphSourceIdentity = {
+  type: "durable";
+  token: string;
+} | {
+  type: "capture-only";
+} | {
+  type: "authored";
+} | {
+  type: "missing-token";
+} | {
+  type: "invalid";
+};
+/** Byte captures can follow derivations; only explicit copies carry durable tokens. */
+declare const inspectParagraphSourceIdentity: (paragraph: document_d_exports.Paragraph, document: document_d_exports.Document) => ParagraphSourceIdentity;
 type ParagraphCloneOverrides = Omit<Partial<document_d_exports.Paragraph>, "type">;
 /** Clone a paragraph while deliberately retaining its parsed `w:pPr` owner. */
 declare const cloneParagraphWithPropertySource: (paragraph: document_d_exports.Paragraph, overrides: ParagraphCloneOverrides) => document_d_exports.Paragraph;
@@ -136,4 +150,4 @@ declare const linkParagraphPropertySourceCandidate: (target: document_d_exports.
 declare const getParagraphPropertySourceCandidate: (paragraph: document_d_exports.Paragraph) => document_d_exports.Paragraph | undefined;
 declare const getParagraphPropertySourceTransferId: (paragraph: document_d_exports.Paragraph) => string | undefined;
 //#endregion
-export { DecodedTableCellParagraphSourcePayload, PARAGRAPH_PROPERTY_SOURCE_VALIDATION_CODES, PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR, ParagraphPropertySourceTransfer, ParagraphPropertySourceValidationCode, ParagraphPropertySourceValidationError, TABLE_CELL_PARAGRAPH_SOURCE_BINDING_ATTR, TABLE_CELL_PARAGRAPH_SOURCE_PAYLOAD_ERROR_CLASSIFICATIONS, TableCellParagraphPropertySourceBinding, TableCellParagraphSourcePayloadErrorClassification, assignDocumentParagraphPropertySourceContract, assignParagraphPropertySource, cloneDocumentWithParagraphPropertySources, cloneParagraphWithPropertySource, cloneParagraphWithoutPropertySource, cloneTableCellsWithParagraphPropertyCaptures, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphPropertyCapture, copyParagraphPropertySource, createProseParagraphWithPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getExplicitParagraphPropertySourceTransfers, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, isParagraphPropertySourceToken, joinProseParagraphsWithRightPropertySource, linkParagraphPropertySourceCandidate, linkProseParagraphPropertySource, markParagraphPropertySourceTransfers, paragraphPropertySourceBelongsToDocument, paragraphPropertySourceMatchesEmission, paragraphPropertySourceTokenMatchesContract, proseParagraphAttrsWithoutPropertySource, recreateProseNodeWithDetachedParagraphPropertySource, recreateProseNodeWithParagraphPropertySource, restoreTableCellsWithParagraphPropertySources, setProseParagraphMarkupWithPropertySource, transferProseParagraphPropertySource, transportTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings };
+export { DecodedTableCellParagraphSourcePayload, PARAGRAPH_PROPERTY_SOURCE_VALIDATION_CODES, PROSE_PARAGRAPH_SOURCE_CONTRACT_ATTR, PROSE_PARAGRAPH_SOURCE_TOKEN_ATTR, ParagraphPropertySourceTransfer, ParagraphPropertySourceValidationCode, ParagraphPropertySourceValidationError, TABLE_CELL_PARAGRAPH_SOURCE_BINDING_ATTR, TABLE_CELL_PARAGRAPH_SOURCE_PAYLOAD_ERROR_CLASSIFICATIONS, TableCellParagraphPropertySourceBinding, TableCellParagraphSourcePayloadErrorClassification, assignDocumentParagraphPropertySourceContract, assignParagraphPropertySource, cloneDocumentWithParagraphPropertySources, cloneParagraphWithPropertySource, cloneParagraphWithoutPropertySource, cloneTableCellsWithParagraphPropertyCaptures, copyDocumentParagraphPropertySourceContract, copyDocumentParagraphPropertySources, copyParagraphPropertyCapture, copyParagraphPropertySource, createProseParagraphWithPropertySource, decodeTableCellParagraphSourcePayload, getDocumentParagraphPropertySourceContract, getExplicitParagraphPropertySourceTransfers, getParagraphPropertySource, getParagraphPropertySourceCandidate, getParagraphPropertySourceToken, getParagraphPropertySourceTransferId, getProseDocumentParagraphPropertySourceContract, getProseParagraphPropertySourceToken, inspectParagraphSourceIdentity, isParagraphPropertySourceToken, joinProseParagraphsWithRightPropertySource, linkParagraphPropertySourceCandidate, linkProseParagraphPropertySource, markParagraphPropertySourceTransfers, paragraphPropertySourceBelongsToDocument, paragraphPropertySourceMatchesEmission, paragraphPropertySourceTokenMatchesContract, proseParagraphAttrsWithoutPropertySource, recreateProseNodeWithDetachedParagraphPropertySource, recreateProseNodeWithParagraphPropertySource, restoreTableCellsWithParagraphPropertySources, setProseParagraphMarkupWithPropertySource, transferProseParagraphPropertySource, transportTableCellsWithParagraphPropertySources, visitDocumentStoryParagraphs, visitTableCellParagraphPropertySourceBindings };