@stll/folio-core 0.47.7 → 0.49.0

package/dist/docx/runParser.js

@@ -1,6 +1,6 @@
 import { parseHorizontalScalePercent } from "../utils/horizontalScale.js";
 import { NO_MODELLED_ATTRIBUTES, attributeRemainder } from "./attributeRemainder.js";
-import { CAPTURE, dispatchChildren, keptUnless, ownedElsewhere, sequencePositions } from "./containerChildren.js";
+import { CAPTURE, dispatchChildrenWithContext, keptUnless, ownedElsewhere, sequencePositions } from "./containerChildren.js";
 import { parseDiagramPreview } from "./diagramPreview.js";
 import { parseFieldState } from "./fieldState.js";
 import { isGroupDrawing, parseGroupDrawing } from "./groupDrawingParser.js";
@@ -8,7 +8,9 @@ import { parseImage } from "./imageParser.js";
 import { imageRawXmlFingerprint } from "./imageRawXml.js";
 import { EmphasisMarkSchema, FontHintSchema, FontThemeSchema, HighlightColorSchema, PositionalTabAlignmentSchema, PositionalTabLeaderSchema, PositionalTabRelativeToSchema, TextEffectSchema, UnderlineStyleSchema, narrowEnum } from "./parserEnums.js";
 import { preserveRunChild } from "./preservedRunContent.js";
+import { standalonePreviewLedger } from "./previewBudget.js";
 import { parseShading } from "./shadingParser.js";
+import { captureShapeAlternateContent } from "./shapeAlternateContent.js";
 import { parseShapeFromDrawing, shouldPreserveRawShapeDrawing } from "./shapeParser.js";
 import { isTextBoxDrawing } from "./textBoxParser.js";
 import { parseThemeColorAttribute } from "./themeColorAttribute.js";
@@ -69,7 +71,7 @@ const RUN_PROPERTY_OWNERS = {
 * The children each owner's sibling record claims.
 *
 * Not the decision map: that one is total over the schema and lives in
-* {@link parseRunProperties}. This names only the children a given owner reads
+* {@link RUN_PROPERTY_HANDLERS}. This names only the children a given owner reads
 * somewhere else, so both cannot write the same element.
 */
 const OWNED_BY_A_SIBLING_RECORD = {
@@ -102,6 +104,16 @@ const OWNED_BY_A_SIBLING_RECORD = {
 	},
 	standalone: {}
 };
+/** The last statement of each declared property in `rPr`, by local name. */
+const lastOccurrences = (rPr) => {
+	const winner = /* @__PURE__ */ new Map();
+	for (const child of getChildElements(rPr)) {
+		const namespace = getNamespaceUri(child);
+		if (namespace !== void 0 && !WORDPROCESSINGML_NAMESPACE_URIS.has(namespace)) continue;
+		winner.set(getLocalName(child.name), child);
+	}
+	return winner;
+};
 /**
 * A property stated twice in one `w:rPr` resolves to the last statement.
 *
@@ -123,17 +135,18 @@ const OWNED_BY_A_SIBLING_RECORD = {
 * first and a reader that takes the last then read the same value.
 *
 * The name comes off the child rather than from the map key, so the guard
-* cannot name a property the handler does not read.
+* cannot name a property the handler does not read. `undefined` is "handled,
+* nothing to capture": a beaten statement is neither read nor written.
 */
-const readLastOccurrenceOnly = (rPr) => {
-	const winner = /* @__PURE__ */ new Map();
-	for (const child of getChildElements(rPr)) {
-		const namespace = getNamespaceUri(child);
-		if (namespace !== void 0 && !WORDPROCESSINGML_NAMESPACE_URIS.has(namespace)) continue;
-		winner.set(getLocalName(child.name), child);
-	}
-	return (read) => (child) => winner.get(getLocalName(child.name)) === child ? read(child) : void 0;
-};
+const readLastOccurrenceOnly = (read) => (child, context) => context.winner.get(getLocalName(child.name)) === child ? read(child, context) : void 0;
+const readToggle = (field) => readLastOccurrenceOnly((child, { formatting }) => {
+	formatting[field] = parseBooleanElement(child);
+});
+const readNumericVal = (field) => readLastOccurrenceOnly((child, { formatting }) => {
+	const val = parseNumericAttribute(child, "w", "val");
+	if (val !== void 0) formatting[field] = val;
+	return keptUnless(val !== void 0);
+});
 /**
 * `w:vertAlign` `baseline` is the reserved value that means "no vertical
 * offset", not a third offset beside `superscript` and `subscript`. It is
@@ -225,6 +238,131 @@ const readLanguage = (lang, formatting) => {
 	return true;
 };
 /**
+* The `w:rPr` decision map, before the owner's own claims. Built once: every
+* reader takes the record it fills from the walk's context rather than
+* closing over it. See {@link parseRunProperties} for what each disposition
+* means.
+*/
+const RUN_PROPERTY_BASE_HANDLERS = {
+	ins: CAPTURE,
+	del: CAPTURE,
+	moveFrom: CAPTURE,
+	moveTo: CAPTURE,
+	rStyle: readLastOccurrenceOnly((child, { formatting }) => {
+		const val = getAttribute(child, "w", "val");
+		if (val) formatting.styleId = val;
+		return keptUnless(Boolean(val));
+	}),
+	rFonts: readLastOccurrenceOnly((child, { formatting, theme }) => keptUnless(readFontFamily(child, theme, formatting))),
+	b: readToggle("bold"),
+	bCs: readToggle("boldCs"),
+	i: readToggle("italic"),
+	iCs: readToggle("italicCs"),
+	caps: readToggle("allCaps"),
+	smallCaps: readToggle("smallCaps"),
+	strike: readToggle("strike"),
+	dstrike: readToggle("doubleStrike"),
+	outline: readToggle("outline"),
+	shadow: readToggle("shadow"),
+	emboss: readToggle("emboss"),
+	imprint: readToggle("imprint"),
+	noProof: readToggle("noProof"),
+	vanish: readToggle("hidden"),
+	rtl: readToggle("rtl"),
+	cs: readToggle("cs"),
+	/** Whether the run follows the section's document grid; no layout slot. */
+	snapToGrid: CAPTURE,
+	/** Web-view-only hiding, distinct from `w:vanish`; nothing reads it. */
+	webHidden: CAPTURE,
+	color: readLastOccurrenceOnly((child, { formatting }) => {
+		const color = parseColorValue({
+			rgb: getAttribute(child, "w", "val"),
+			themeColor: getAttribute(child, "w", "themeColor"),
+			themeTint: getAttribute(child, "w", "themeTint"),
+			themeShade: getAttribute(child, "w", "themeShade"),
+			element: child.name ?? "w:color"
+		});
+		if (Object.keys(color).length === 0) return CAPTURE;
+		formatting.color = color;
+	}),
+	spacing: readNumericVal("spacing"),
+	w: readLastOccurrenceOnly((child, { formatting }) => {
+		const val = parseHorizontalScalePercent(getAttribute(child, "w", "val"));
+		if (val !== void 0) formatting.scale = val;
+		return keptUnless(val !== void 0);
+	}),
+	kern: readNumericVal("kerning"),
+	position: readNumericVal("position"),
+	sz: readNumericVal("fontSize"),
+	szCs: readNumericVal("fontSizeCs"),
+	highlight: readLastOccurrenceOnly((child, { formatting }) => {
+		const val = narrowEnum(getAttribute(child, "w", "val"), HighlightColorSchema);
+		if (val) formatting.highlight = val;
+		return keptUnless(Boolean(val));
+	}),
+	u: readLastOccurrenceOnly((child, { formatting }) => keptUnless(readUnderline(child, formatting))),
+	effect: readLastOccurrenceOnly((child, { formatting }) => {
+		const val = narrowEnum(getAttribute(child, "w", "val"), TextEffectSchema);
+		if (val) formatting.effect = val;
+		return keptUnless(Boolean(val));
+	}),
+	/** A text border around the run; `BorderSpec` is a paragraph/table slot. */
+	bdr: CAPTURE,
+	shd: readLastOccurrenceOnly((child, { formatting }) => {
+		const shading = parseShading(child);
+		if (shading) formatting.shading = shading;
+		return keptUnless(shading !== void 0);
+	}),
+	/** Compress the run's text into a fixed width; no layout slot holds it. */
+	fitText: CAPTURE,
+	vertAlign: readLastOccurrenceOnly((child, { formatting }) => {
+		const val = getAttribute(child, "w", "val");
+		if (val === "superscript" || val === "subscript" || val === "baseline") {
+			formatting.vertAlign = val;
+			return;
+		}
+		return CAPTURE;
+	}),
+	em: readLastOccurrenceOnly((child, { formatting }) => {
+		const val = narrowEnum(getAttribute(child, "w", "val"), EmphasisMarkSchema);
+		if (val) formatting.emphasisMark = val;
+		return keptUnless(Boolean(val));
+	}),
+	lang: readLastOccurrenceOnly((child, { formatting }) => keptUnless(readLanguage(child, formatting))),
+	/** East Asian two-lines-in-one and horizontal-in-vertical typesetting. */
+	eastAsianLayout: CAPTURE,
+	/**
+	* The run-in heading marker. Under a run the schema declares it and folio
+	* models nothing for it; a paragraph mark's record reads it instead (see
+	* {@link RUN_PROPERTY_HANDLERS}).
+	*/
+	specVanish: CAPTURE,
+	/** The run is part of an equation; folio has no run-level maths slot. */
+	oMath: CAPTURE,
+	/**
+	* The tracked property change. A run's record reads it into
+	* `Run.propertyChanges`; a paragraph mark has no such record, so its
+	* snapshot is kept whole rather than dropped with the revision.
+	*/
+	rPrChange: CAPTURE
+};
+/** Each owner's total `w:rPr` decision map. */
+const RUN_PROPERTY_HANDLERS = {
+	run: {
+		...RUN_PROPERTY_BASE_HANDLERS,
+		...OWNED_BY_A_SIBLING_RECORD.run
+	},
+	paragraphMark: {
+		...RUN_PROPERTY_BASE_HANDLERS,
+		specVanish: readLastOccurrenceOnly(() => void 0),
+		...OWNED_BY_A_SIBLING_RECORD.paragraphMark
+	},
+	standalone: {
+		...RUN_PROPERTY_BASE_HANDLERS,
+		...OWNED_BY_A_SIBLING_RECORD.standalone
+	}
+};
+/**
 * The one reader of a run property set (`w:rPr`).
 *
 * Every owner reads through here — a run, the paragraph mark, a style, a
@@ -253,167 +391,16 @@ const readLanguage = (lang, formatting) => {
 function parseRunProperties(rPr, theme, owner) {
 	if (!rPr) return;
 	const formatting = {};
-	const wins = readLastOccurrenceOnly(rPr);
-	const preserved = dispatchChildren({
+	const preserved = dispatchChildrenWithContext({
 		element: rPr,
 		container: "run-properties",
-		handlers: {
-			ins: CAPTURE,
-			del: CAPTURE,
-			moveFrom: CAPTURE,
-			moveTo: CAPTURE,
-			rStyle: wins((child) => {
-				const val = getAttribute(child, "w", "val");
-				if (val) formatting.styleId = val;
-				return keptUnless(Boolean(val));
-			}),
-			rFonts: wins((child) => keptUnless(readFontFamily(child, theme, formatting))),
-			b: wins((child) => {
-				formatting.bold = parseBooleanElement(child);
-			}),
-			bCs: wins((child) => {
-				formatting.boldCs = parseBooleanElement(child);
-			}),
-			i: wins((child) => {
-				formatting.italic = parseBooleanElement(child);
-			}),
-			iCs: wins((child) => {
-				formatting.italicCs = parseBooleanElement(child);
-			}),
-			caps: wins((child) => {
-				formatting.allCaps = parseBooleanElement(child);
-			}),
-			smallCaps: wins((child) => {
-				formatting.smallCaps = parseBooleanElement(child);
-			}),
-			strike: wins((child) => {
-				formatting.strike = parseBooleanElement(child);
-			}),
-			dstrike: wins((child) => {
-				formatting.doubleStrike = parseBooleanElement(child);
-			}),
-			outline: wins((child) => {
-				formatting.outline = parseBooleanElement(child);
-			}),
-			shadow: wins((child) => {
-				formatting.shadow = parseBooleanElement(child);
-			}),
-			emboss: wins((child) => {
-				formatting.emboss = parseBooleanElement(child);
-			}),
-			imprint: wins((child) => {
-				formatting.imprint = parseBooleanElement(child);
-			}),
-			noProof: wins((child) => {
-				formatting.noProof = parseBooleanElement(child);
-			}),
-			vanish: wins((child) => {
-				formatting.hidden = parseBooleanElement(child);
-			}),
-			rtl: wins((child) => {
-				formatting.rtl = parseBooleanElement(child);
-			}),
-			cs: wins((child) => {
-				formatting.cs = parseBooleanElement(child);
-			}),
-			/** Whether the run follows the section's document grid; no layout slot. */
-			snapToGrid: CAPTURE,
-			/** Web-view-only hiding, distinct from `w:vanish`; nothing reads it. */
-			webHidden: CAPTURE,
-			color: wins((child) => {
-				const color = parseColorValue({
-					rgb: getAttribute(child, "w", "val"),
-					themeColor: getAttribute(child, "w", "themeColor"),
-					themeTint: getAttribute(child, "w", "themeTint"),
-					themeShade: getAttribute(child, "w", "themeShade"),
-					element: child.name ?? "w:color"
-				});
-				if (Object.keys(color).length === 0) return CAPTURE;
-				formatting.color = color;
-			}),
-			spacing: wins((child) => {
-				const val = parseNumericAttribute(child, "w", "val");
-				if (val !== void 0) formatting.spacing = val;
-				return keptUnless(val !== void 0);
-			}),
-			w: wins((child) => {
-				const val = parseHorizontalScalePercent(getAttribute(child, "w", "val"));
-				if (val !== void 0) formatting.scale = val;
-				return keptUnless(val !== void 0);
-			}),
-			kern: wins((child) => {
-				const val = parseNumericAttribute(child, "w", "val");
-				if (val !== void 0) formatting.kerning = val;
-				return keptUnless(val !== void 0);
-			}),
-			position: wins((child) => {
-				const val = parseNumericAttribute(child, "w", "val");
-				if (val !== void 0) formatting.position = val;
-				return keptUnless(val !== void 0);
-			}),
-			sz: wins((child) => {
-				const val = parseNumericAttribute(child, "w", "val");
-				if (val !== void 0) formatting.fontSize = val;
-				return keptUnless(val !== void 0);
-			}),
-			szCs: wins((child) => {
-				const val = parseNumericAttribute(child, "w", "val");
-				if (val !== void 0) formatting.fontSizeCs = val;
-				return keptUnless(val !== void 0);
-			}),
-			highlight: wins((child) => {
-				const val = narrowEnum(getAttribute(child, "w", "val"), HighlightColorSchema);
-				if (val) formatting.highlight = val;
-				return keptUnless(Boolean(val));
-			}),
-			u: wins((child) => keptUnless(readUnderline(child, formatting))),
-			effect: wins((child) => {
-				const val = narrowEnum(getAttribute(child, "w", "val"), TextEffectSchema);
-				if (val) formatting.effect = val;
-				return keptUnless(Boolean(val));
-			}),
-			/** A text border around the run; `BorderSpec` is a paragraph/table slot. */
-			bdr: CAPTURE,
-			shd: wins((child) => {
-				const shading = parseShading(child);
-				if (shading) formatting.shading = shading;
-				return keptUnless(shading !== void 0);
-			}),
-			/** Compress the run's text into a fixed width; no layout slot holds it. */
-			fitText: CAPTURE,
-			vertAlign: wins((child) => {
-				const val = getAttribute(child, "w", "val");
-				if (val === "superscript" || val === "subscript" || val === "baseline") {
-					formatting.vertAlign = val;
-					return;
-				}
-				return CAPTURE;
-			}),
-			em: wins((child) => {
-				const val = narrowEnum(getAttribute(child, "w", "val"), EmphasisMarkSchema);
-				if (val) formatting.emphasisMark = val;
-				return keptUnless(Boolean(val));
-			}),
-			lang: wins((child) => keptUnless(readLanguage(child, formatting))),
-			/** East Asian two-lines-in-one and horizontal-in-vertical typesetting. */
-			eastAsianLayout: CAPTURE,
-			/**
-			* The run-in heading marker. On a paragraph mark the paragraph's record
-			* reads it (`runInWithNext`); under a run the schema declares it and folio
-			* models nothing for it.
-			*/
-			specVanish: owner === RUN_PROPERTY_OWNERS.paragraphMark ? wins(() => void 0) : CAPTURE,
-			/** The run is part of an equation; folio has no run-level maths slot. */
-			oMath: CAPTURE,
-			/**
-			* The tracked property change. A run's record reads it into
-			* `Run.propertyChanges`; a paragraph mark has no such record, so its
-			* snapshot is kept whole rather than dropped with the revision.
-			*/
-			rPrChange: CAPTURE,
-			...OWNED_BY_A_SIBLING_RECORD[owner]
-		},
-		capturePosition: sequencePositions("run-properties", rPr)
+		handlers: RUN_PROPERTY_HANDLERS[owner],
+		capturePosition: sequencePositions("run-properties", rPr),
+		context: {
+			formatting,
+			theme,
+			winner: lastOccurrences(rPr)
+		}
 	});
 	if (preserved) formatting.preserved = preserved;
 	return formatting;
@@ -570,8 +557,8 @@ const preserveOnlyDrawing = (rawXml) => ({
 * - anything the model cannot project (a group the rasterizer declines,
 *   a diagram, a shape with unmodeled properties) → preservation-only raw XML.
 */
-function parseDrawingContent(element, rels, media) {
-	const groupImage = parseGroupDrawing(element, rels ?? void 0, media ?? void 0);
+function parseDrawingContent(element, rels, media, previews) {
+	const groupImage = parseGroupDrawing(element, previews, rels ?? void 0, media ?? void 0);
 	if (groupImage) return {
 		type: "drawing",
 		image: groupImage,
@@ -612,7 +599,7 @@ function parseDrawingContent(element, rels, media) {
 /**
 * Parse all content within a run element
 */
-function parseRunContents(runElement, rels, media, rootXmlns = {}) {
+function parseRunContents(runElement, rels, media, previews, rootXmlns = {}) {
 	const contents = [];
 	const children = getChildElements(runElement);
 	for (const child of children) switch (getLocalName(child.name)) {
@@ -650,12 +637,12 @@ function parseRunContents(runElement, rels, media, rootXmlns = {}) {
 			contents.push({ type: "noBreakHyphen" });
 			break;
 		case "drawing": {
-			const drawing = parseDrawingContent(child, rels, media);
+			const drawing = parseDrawingContent(child, rels, media, previews);
 			if (drawing) contents.push(drawing);
 			break;
 		}
 		case "pict": {
-			const vmlDrawing = parseVmlImageContent(child, rels, media, rootXmlns);
+			const vmlDrawing = parseVmlImageContent(child, rels, media, previews, rootXmlns);
 			if (vmlDrawing) {
 				contents.push(vmlDrawing);
 				break;
@@ -664,7 +651,7 @@ function parseRunContents(runElement, rels, media, rootXmlns = {}) {
 			break;
 		}
 		case "object": {
-			const objectPreview = parseVmlImageContent(child, rels, media, rootXmlns);
+			const objectPreview = parseVmlImageContent(child, rels, media, previews, rootXmlns);
 			contents.push(objectPreview ?? preserveRunChild(child));
 			break;
 		}
@@ -687,7 +674,7 @@ function parseRunContents(runElement, rels, media, rootXmlns = {}) {
 			const choiceTextBoxDrawing = choiceEl ? getChildElements(choiceEl).find((element) => getLocalName(element.name) === "drawing" && isTextBoxDrawing(element)) : void 0;
 			const groupedChoiceDrawing = choiceEl ? getChildElements(choiceEl).find((element) => getLocalName(element.name) === "drawing" && findAllDeep(element, "wpg", "wgp").length > 0) : void 0;
 			if (groupedChoiceDrawing) {
-				const groupedDrawing = parseDrawingContent(groupedChoiceDrawing, rels, media);
+				const groupedDrawing = parseDrawingContent(groupedChoiceDrawing, rels, media, previews);
 				if (groupedDrawing?.type === "drawing" && groupedDrawing.rawXmlMode === DRAWING_RAW_XML_MODES.PREVIEW_ONLY && groupedDrawing.image.src) {
 					contents.push({
 						...groupedDrawing,
@@ -697,7 +684,7 @@ function parseRunContents(runElement, rels, media, rootXmlns = {}) {
 				}
 			}
 			const fallbackPict = fallbackEl ? getChildElements(fallbackEl).find((el) => getLocalName(el.name) === "pict") : void 0;
-			const fallbackVml = fallbackPict && !choiceTextBoxDrawing ? parseVmlImageContent(fallbackPict, rels, media, rootXmlns) : null;
+			const fallbackVml = fallbackPict && !choiceTextBoxDrawing ? parseVmlImageContent(fallbackPict, rels, media, previews, rootXmlns) : null;
 			if (fallbackVml?.image.src) {
 				fallbackVml.rawXml = captureVerbatimXml(cloneWithXmlnsDeclarations(child, rootXmlns));
 				contents.push(fallbackVml);
@@ -707,13 +694,22 @@ function parseRunContents(runElement, rels, media, rootXmlns = {}) {
 			if (targetEl) for (const innerChild of getChildElements(targetEl)) {
 				const innerName = getLocalName(innerChild.name);
 				if (innerName === "drawing") {
-					const innerDrawing = parseDrawingContent(innerChild, rels, media);
+					const innerDrawing = parseDrawingContent(innerChild, rels, media, previews);
 					if (innerDrawing) {
 						if (innerDrawing.type === "drawing" && (innerDrawing.rawXml !== void 0 || !innerDrawing.image.src)) innerDrawing.rawXml = captureVerbatimXml(child);
+						if (innerDrawing.type === "shape") {
+							const alternateContent = captureShapeAlternateContent({
+								shape: innerDrawing.shape,
+								alternateContent: child,
+								branch: targetEl,
+								drawing: innerChild
+							});
+							if (alternateContent) innerDrawing.alternateContent = alternateContent;
+						}
 						contents.push(innerDrawing);
 					}
 				} else if (innerName === "pict") {
-					const innerVml = parseVmlImageContent(innerChild, rels, media, rootXmlns);
+					const innerVml = parseVmlImageContent(innerChild, rels, media, previews, rootXmlns);
 					if (innerVml) {
 						innerVml.rawXml = captureVerbatimXml(cloneWithXmlnsDeclarations(child, rootXmlns));
 						contents.push(innerVml);
@@ -721,7 +717,7 @@ function parseRunContents(runElement, rels, media, rootXmlns = {}) {
 				} else contents.push(...parseRunContents({
 					...targetEl,
 					elements: [innerChild]
-				}, rels, media, rootXmlns));
+				}, rels, media, previews, rootXmlns));
 			}
 			const hasTextBoxBranch = [choiceEl, fallbackEl].some((branch) => getChildElements(branch).some((element) => getLocalName(element.name) === "drawing" && isTextBoxDrawing(element)));
 			if (contents.length === contentsBeforeAlternate && !hasTextBoxBranch) contents.push(preserveOnlyDrawing(captureVerbatimXml(cloneWithXmlnsDeclarations(child, rootXmlns))));
@@ -742,9 +738,11 @@ function parseRunContents(runElement, rels, media, rootXmlns = {}) {
 * @param theme - Theme for resolving theme colors/fonts
 * @param rels - Relationship map for resolving image references
 * @param media - Media files map for image data
+* @param previews - The ledger of the package this run belongs to; a run read
+*   on its own charges its previews to no package
 * @returns Parsed Run object
 */
-function parseRun(node, _styles, theme, rels = null, media = null, rootXmlns = {}) {
+function parseRun(node, _styles, theme, rels = null, media = null, rootXmlns = {}, previews = standalonePreviewLedger()) {
 	const run = {
 		type: "run",
 		content: []
@@ -756,7 +754,7 @@ function parseRun(node, _styles, theme, rels = null, media = null, rootXmlns = {
 		const propertyChangesResult = parseRunPropertyChanges(rPr, theme, run.formatting);
 		if (propertyChangesResult) run.propertyChanges = propertyChangesResult;
 	}
-	run.content = parseRunContents(node, rels, media, mergeXmlnsDeclarations(rootXmlns, node));
+	run.content = parseRunContents(node, rels, media, previews, mergeXmlnsDeclarations(rootXmlns, node));
 	const remainder = attributeRemainder({
 		element: node,
 		modelled: NO_MODELLED_ATTRIBUTES

package/dist/docx/sdtProperties.js

@@ -1,4 +1,4 @@
-import { CAPTURE, dispatchChildren, keptUnless, sequencePositions } from "./containerChildren.js";
+import { CAPTURE, dispatchChildrenWithContext, keptUnless, sequencePositions } from "./containerChildren.js";
 import { SdtLockSchema, narrowEnum } from "./parserEnums.js";
 import { RUN_PROPERTY_OWNERS, parseRunProperties } from "./runParser.js";
 import { captureVerbatimXml } from "./verbatimCapture.js";
@@ -287,6 +287,88 @@ const captureSdtSiblingMarkers = (sdt) => {
 		after: afterParts.join("")
 	};
 };
+/** Read a projection off a control-kind element, and keep the element. */
+const kind = (read) => (element, props) => {
+	read(props, element);
+	return CAPTURE;
+};
+const SDT_PROPERTY_HANDLERS = {
+	rPr: CAPTURE,
+	alias: (element, props) => {
+		const value = getAttributeAnyPrefix(element, "val");
+		if (value !== null) props.alias = value;
+		return keptUnless(value !== null);
+	},
+	tag: (element, props) => {
+		const value = getAttributeAnyPrefix(element, "val");
+		if (value !== null) props.tag = value;
+		return keptUnless(value !== null);
+	},
+	id: (element, props) => {
+		const raw = getAttributeAnyPrefix(element, "val");
+		const value = raw === null ? NaN : Number.parseInt(raw, 10);
+		if (!Number.isNaN(value)) props.id = value;
+		return keptUnless(!Number.isNaN(value));
+	},
+	lock: (element, props) => {
+		const value = narrowEnum(getAttributeAnyPrefix(element, "val"), SdtLockSchema);
+		if (value !== void 0) props.lock = value;
+		return keptUnless(value !== void 0);
+	},
+	placeholder: (element, props) => {
+		const value = getAttributeAnyPrefix(findChild(element, "w", "docPart"), "val");
+		if (value !== null) props.placeholder = value;
+		return keptUnless(value !== null);
+	},
+	temporary: CAPTURE,
+	showingPlcHdr: (element, props) => {
+		props.showingPlaceholder = parseBooleanElement(element, "w");
+	},
+	dataBinding: CAPTURE,
+	label: CAPTURE,
+	tabIndex: CAPTURE,
+	equation: kind(() => {}),
+	comboBox: kind((props, element) => {
+		props.sdtType = "comboBox";
+		props.listItems = parseListItems(element);
+		readLastValue(element, props);
+	}),
+	date: kind((props, element) => {
+		props.sdtType = "date";
+		const format = getAttributeAnyPrefix(findChild(element, "w", "dateFormat"), "val");
+		if (format !== null) props.dateFormat = format;
+		const fullDate = getAttributeAnyPrefix(element, "fullDate");
+		if (fullDate !== null) props.dateValueISO = fullDate;
+	}),
+	docPartObj: kind((props) => {
+		props.sdtType = "buildingBlockGallery";
+	}),
+	docPartList: kind((props) => {
+		props.sdtType = "buildingBlockGallery";
+	}),
+	dropDownList: kind((props, element) => {
+		props.sdtType = "dropdown";
+		props.listItems = parseListItems(element);
+		readLastValue(element, props);
+	}),
+	picture: kind((props) => {
+		props.sdtType = "picture";
+	}),
+	richText: kind(() => {}),
+	text: kind((props) => {
+		props.sdtType = "plainText";
+	}),
+	citation: kind(() => {}),
+	group: kind((props) => {
+		props.sdtType = "group";
+	}),
+	bibliography: kind(() => {})
+};
+const SDT_PROPERTY_UNDECLARED = { [CHECKBOX_CHILD]: kind((props, element) => {
+	props.sdtType = "checkbox";
+	const state = findChild(element, "w14", "checked") ?? findChild(element, "w", "checked");
+	props.checked = state === null ? false : parseBooleanElement(state, "w14");
+}) };
 /**
 * Parse `<w:sdtPr>` (and optional `<w:sdtEndPr>`) into {@link SdtProperties}.
 *
@@ -301,92 +383,13 @@ const captureSdtSiblingMarkers = (sdt) => {
 function parseSdtProperties(sdtPr, sdtEndPr) {
 	const props = { sdtType: "richText" };
 	if (sdtPr) {
-		/** Read a projection off a control-kind element, and keep the element. */
-		const kind = (read) => (element) => {
-			read(element);
-			return CAPTURE;
-		};
-		const preserved = dispatchChildren({
+		const preserved = dispatchChildrenWithContext({
 			element: sdtPr,
 			container: "content-control-properties",
-			handlers: {
-				rPr: CAPTURE,
-				alias: (element) => {
-					const value = getAttributeAnyPrefix(element, "val");
-					if (value !== null) props.alias = value;
-					return keptUnless(value !== null);
-				},
-				tag: (element) => {
-					const value = getAttributeAnyPrefix(element, "val");
-					if (value !== null) props.tag = value;
-					return keptUnless(value !== null);
-				},
-				id: (element) => {
-					const raw = getAttributeAnyPrefix(element, "val");
-					const value = raw === null ? NaN : Number.parseInt(raw, 10);
-					if (!Number.isNaN(value)) props.id = value;
-					return keptUnless(!Number.isNaN(value));
-				},
-				lock: (element) => {
-					const value = narrowEnum(getAttributeAnyPrefix(element, "val"), SdtLockSchema);
-					if (value !== void 0) props.lock = value;
-					return keptUnless(value !== void 0);
-				},
-				placeholder: (element) => {
-					const value = getAttributeAnyPrefix(findChild(element, "w", "docPart"), "val");
-					if (value !== null) props.placeholder = value;
-					return keptUnless(value !== null);
-				},
-				temporary: CAPTURE,
-				showingPlcHdr: (element) => {
-					props.showingPlaceholder = parseBooleanElement(element, "w");
-				},
-				dataBinding: CAPTURE,
-				label: CAPTURE,
-				tabIndex: CAPTURE,
-				equation: kind(() => {}),
-				comboBox: kind((element) => {
-					props.sdtType = "comboBox";
-					props.listItems = parseListItems(element);
-					readLastValue(element, props);
-				}),
-				date: kind((element) => {
-					props.sdtType = "date";
-					const format = getAttributeAnyPrefix(findChild(element, "w", "dateFormat"), "val");
-					if (format !== null) props.dateFormat = format;
-					const fullDate = getAttributeAnyPrefix(element, "fullDate");
-					if (fullDate !== null) props.dateValueISO = fullDate;
-				}),
-				docPartObj: kind(() => {
-					props.sdtType = "buildingBlockGallery";
-				}),
-				docPartList: kind(() => {
-					props.sdtType = "buildingBlockGallery";
-				}),
-				dropDownList: kind((element) => {
-					props.sdtType = "dropdown";
-					props.listItems = parseListItems(element);
-					readLastValue(element, props);
-				}),
-				picture: kind(() => {
-					props.sdtType = "picture";
-				}),
-				richText: kind(() => {}),
-				text: kind(() => {
-					props.sdtType = "plainText";
-				}),
-				citation: kind(() => {}),
-				group: kind(() => {
-					props.sdtType = "group";
-				}),
-				bibliography: kind(() => {})
-			},
+			handlers: SDT_PROPERTY_HANDLERS,
 			capturePosition: sequencePositions("content-control-properties", sdtPr),
-			undeclared: { [CHECKBOX_CHILD]: kind((element) => {
-				props.sdtType = "checkbox";
-				const state = findChild(element, "w14", "checked") ?? findChild(element, "w", "checked");
-				props.checked = state === null ? false : parseBooleanElement(state, "w14");
-			}) }
+			undeclared: SDT_PROPERTY_UNDECLARED,
+			context: props
 		});
 		if (preserved !== void 0) props.preserved = preserved;
 	}