ooxml.js 3.0.1 → 3.1.1

package/dist/typed/docx/read.cjs

@@ -8,6 +8,7 @@ const require_typed_shared_drawingml = require("../shared/drawingml.cjs");
 const require_typed_shared_source_path = require("../shared/source-path.cjs");
 const require_typed_docx_styles = require("./styles.cjs");
 const require_typed_docx_numbering = require("./numbering.cjs");
+const require_typed_docx_constructs = require("./constructs.cjs");
 let zod = require("zod");
 let document_schema_js = require("document-schema.js");
 //#region src/typed/docx/read.ts
@@ -87,13 +88,13 @@ function readRunText(run) {
 	let text = "";
 	for (const child of run.children) {
 		if (child.type !== "element") continue;
-		if (child.tag === "w:t") text += require_typed_util.textContent(child);
+		if (child.tag === "w:t" || child.tag === "w:delText") text += require_typed_util.textContent(child);
 		else if (child.tag === "w:tab") text += "	";
 		else if (child.tag === "w:br" || child.tag === "w:cr") text += "\n";
 	}
 	return text;
 }
-function readDrawingImage(drawing, rels, pkg) {
+function readDrawingImage(drawing, ctx) {
 	const container = require_typed_util.childrenWithTag(drawing, "wp:inline")[0] ?? require_typed_util.childrenWithTag(drawing, "wp:anchor")[0];
 	if (container === void 0) return;
 	const extent = require_typed_util.childrenWithTag(container, "wp:extent")[0];
@@ -104,8 +105,8 @@ function readDrawingImage(drawing, rels, pkg) {
 	const altText = docPr === void 0 ? void 0 : require_typed_util.attr(docPr, "descr") ?? require_typed_util.attr(docPr, "title");
 	const blip = require_typed_util.elementsWithTag(container.children, "a:blip")[0];
 	const rId = blip === void 0 ? void 0 : require_typed_util.attr(blip, "r:embed");
-	const rel = rId === void 0 ? void 0 : rels.get(rId);
-	const mediaPart = rel === void 0 ? void 0 : pkg.parts[rel.target];
+	const rel = rId === void 0 ? void 0 : ctx.rels.get(rId);
+	const mediaPart = rel === void 0 ? void 0 : ctx.pkg.parts[rel.target];
 	if (mediaPart?.kind !== "binary") return;
 	const bytes = require_util_base64.base64ToBytes(mediaPart.base64);
 	const format = require_image_sniff.sniffImageFormat(bytes);
@@ -117,26 +118,26 @@ function readDrawingImage(drawing, rels, pkg) {
 		widthPt: require_typed_shared_units.emuToPt(Number(cx)),
 		heightPt: require_typed_shared_units.emuToPt(Number(cy))
 	};
-	if (altText !== void 0) image.altText = altText;
+	if (altText !== void 0) image.altText = require_typed_util.decodeEntities(altText);
 	return image;
 }
-function collectDrawings(nodes, out) {
+function collectDrawings(nodes, carryDeletions, out) {
 	for (const node of nodes) {
 		if (node.type !== "element") continue;
-		if (node.tag === "w:del") continue;
+		if (!carryDeletions && (node.tag === "w:del" || node.tag === "w:moveFrom")) continue;
 		if (node.tag === "w:drawing") {
 			out.push(node);
 			continue;
 		}
-		collectDrawings(node.children, out);
+		collectDrawings(node.children, carryDeletions, out);
 	}
 }
-function readParagraphImages(paragraph, rels, pkg) {
+function readParagraphImages(paragraph, ctx, carryDeletions) {
 	const drawings = [];
-	collectDrawings(paragraph.children, drawings);
+	collectDrawings(paragraph.children, carryDeletions, drawings);
 	const images = [];
 	for (const drawing of drawings) {
-		const image = readDrawingImage(drawing, rels, pkg);
+		const image = readDrawingImage(drawing, ctx);
 		if (image !== void 0) images.push(image);
 	}
 	return images;
@@ -154,23 +155,22 @@ function readRun(run, paragraph, context) {
 		color: props.color
 	};
 }
-function readParagraphRuns(paragraph, context, rels) {
+function readParagraphRuns(paragraph, ctx, carryDeletions) {
 	const runs = [];
 	let fieldState = "none";
 	function walk(nodes, hyperlinkTarget) {
 		for (const node of nodes) {
 			if (node.type !== "element") continue;
 			if (node.tag === "w:r") {
-				const fldChar = require_typed_util.childrenWithTag(node, "w:fldChar")[0];
-				if (fldChar !== void 0) {
-					const type = require_typed_util.attr(fldChar, "w:fldCharType");
+				const type = require_typed_docx_constructs.fieldCharType(node);
+				if (type !== void 0) {
 					if (type === "begin") fieldState = "code";
 					else if (type === "separate") fieldState = "result";
 					else if (type === "end") fieldState = "none";
 					continue;
 				}
 				if (fieldState === "code") continue;
-				const run = readRun(node, paragraph, context);
+				const run = readRun(node, paragraph, ctx.styles);
 				runs.push(hyperlinkTarget === void 0 ? run : {
 					...run,
 					hyperlink: hyperlinkTarget
@@ -178,21 +178,27 @@ function readParagraphRuns(paragraph, context, rels) {
 			} else if (node.tag === "w:fldSimple") walk(node.children, hyperlinkTarget);
 			else if (node.tag === "w:hyperlink") {
 				const rId = require_typed_util.attr(node, "r:id");
-				const target = rId === void 0 ? void 0 : rels.get(rId)?.target;
+				const target = rId === void 0 ? void 0 : ctx.rels.get(rId)?.target;
 				walk(node.children, target ?? hyperlinkTarget);
-			} else if (node.tag === "w:ins") walk(node.children, hyperlinkTarget);
+			} else if (node.tag === "w:ins" || node.tag === "w:moveTo") walk(node.children, hyperlinkTarget);
+			else if (node.tag === "w:del" || node.tag === "w:moveFrom") {
+				if (carryDeletions) walk(node.children, hyperlinkTarget);
+			} else if (node.tag === "w:sdt") {
+				const sdtContent = require_typed_util.childrenWithTag(node, "w:sdtContent")[0];
+				if (sdtContent !== void 0) walk(sdtContent.children, hyperlinkTarget);
+			}
 		}
 	}
 	walk(paragraph.children, void 0);
 	return runs;
 }
-function readParagraph(paragraph, context, rels) {
+function readParagraph(paragraph, ctx, carryDeletions) {
 	const pPr = require_typed_util.childrenWithTag(paragraph, "w:pPr")[0];
 	const pStyleEl = pPr === void 0 ? void 0 : require_typed_util.childrenWithTag(pPr, "w:pStyle")[0];
-	const props = require_typed_docx_styles.resolveParagraphProperties(paragraph, context);
+	const props = require_typed_docx_styles.resolveParagraphProperties(paragraph, ctx.styles);
 	return {
 		kind: "paragraph",
-		runs: readParagraphRuns(paragraph, context, rels),
+		runs: readParagraphRuns(paragraph, ctx, carryDeletions),
 		styleId: pStyleEl === void 0 ? void 0 : require_typed_util.attr(pStyleEl, "w:val"),
 		headingLevel: props.outlineLvl === void 0 ? void 0 : (0, document_schema_js.clampHeadingLevel)(props.outlineLvl + 1),
 		alignment: props.alignment,
@@ -253,7 +259,7 @@ function readCellBorders(tcPr) {
 	if (bottom !== void 0) borders.bottom = bottom;
 	return Object.keys(borders).length === 0 ? void 0 : borders;
 }
-function readRawCell(tc, context, rels, pkg) {
+function readRawCell(tc, ctx, carryDeletions) {
 	const tcPr = require_typed_util.childrenWithTag(tc, "w:tcPr")[0];
 	const gridSpanEl = tcPr === void 0 ? void 0 : require_typed_util.childrenWithTag(tcPr, "w:gridSpan")[0];
 	const gridSpanVal = gridSpanEl === void 0 ? void 0 : require_typed_util.attr(gridSpanEl, "w:val");
@@ -264,7 +270,7 @@ function readRawCell(tc, context, rels, pkg) {
 		isVMergeContinuation: vMergeVal === "continue",
 		background: readCellShading(tcPr),
 		borders: readCellBorders(tcPr),
-		blocks: readBodyBlocks(tc.children, context, rels, pkg)
+		blocks: readBlockScope(tc.children, ctx, carryDeletions)
 	};
 }
 function readRowHeightPt(tr) {
@@ -274,11 +280,11 @@ function readRowHeightPt(tr) {
 	const val = trHeight === void 0 ? void 0 : require_typed_util.attr(trHeight, "w:val");
 	return val === void 0 ? void 0 : require_typed_shared_units.twipsToPt(Number(val));
 }
-function readTable(tbl, context, rels, pkg) {
+function readTable(tbl, ctx, carryDeletions) {
 	const tblGrid = require_typed_util.childrenWithTag(tbl, "w:tblGrid")[0];
 	const columnWidthsPt = tblGrid === void 0 ? [] : require_typed_util.childrenWithTag(tblGrid, "w:gridCol").map((col) => require_typed_shared_units.twipsToPt(Number(require_typed_util.attr(col, "w:w") ?? "0")));
 	const trs = require_typed_util.childrenWithTag(tbl, "w:tr");
-	const rawRows = trs.map((tr) => require_typed_util.childrenWithTag(tr, "w:tc").map((tc) => readRawCell(tc, context, rels, pkg)));
+	const rawRows = trs.map((tr) => require_typed_util.childrenWithTag(tr, "w:tc").map((tc) => readRawCell(tc, ctx, carryDeletions)));
 	const rowColumnIndices = rawRows.map((row) => {
 		const indices = [];
 		let col = 0;
@@ -313,63 +319,254 @@ function readTable(tbl, context, rels, pkg) {
 		}))
 	};
 }
-function readBodyBlocks(nodes, context, rels, pkg) {
-	const blocks = [];
+function newFlowState() {
+	return {
+		blocks: [],
+		extents: [],
+		sectionBreaks: [],
+		bookmarkEvents: [],
+		openFields: [],
+		order: 0
+	};
+}
+function resolveBookmarkExtents(events) {
+	const byId = /* @__PURE__ */ new Map();
+	for (const event of events) {
+		const existing = byId.get(event.id);
+		if (existing === void 0) byId.set(event.id, [event]);
+		else existing.push(event);
+	}
+	const extents = [];
+	for (const halves of byId.values()) {
+		const start = halves.filter((half) => half.kind === "start");
+		const end = halves.filter((half) => half.kind === "end");
+		const open = start[0];
+		const close = end[0];
+		if (start.length !== 1 || end.length !== 1 || open === void 0 || close === void 0) continue;
+		if (open.name === void 0 || !open.qualified || !close.qualified || close.index < open.index) continue;
+		extents.push({
+			startIndex: open.index,
+			endIndex: close.index,
+			order: open.order,
+			descriptor: require_typed_docx_constructs.bookmarkAnchorDescriptor(open.name)
+		});
+	}
+	return extents;
+}
+function wholeParagraphTrackedChange(index) {
+	const content = require_typed_docx_constructs.contentBearingChildren(index);
+	const first = content[0];
+	if (first === void 0) return;
+	const change = require_typed_docx_constructs.PROVENANCE_CHANGE_BY_TAG.get(first.tag);
+	if (change === void 0 || !content.every((child) => child.tag === first.tag)) return;
+	return {
+		element: first,
+		change
+	};
+}
+function recordParagraphBookmarks(index, paragraphIndex, endIndex, state) {
+	index.elements.forEach((element, position) => {
+		if (element.tag !== "w:bookmarkStart" && element.tag !== "w:bookmarkEnd") return;
+		const id = require_typed_util.attr(element, "w:id");
+		if (id === void 0) return;
+		const leading = index.firstContentIndex === -1 || position < index.firstContentIndex;
+		const trailing = index.lastContentIndex === -1 || position > index.lastContentIndex;
+		if (element.tag === "w:bookmarkStart") {
+			const name = require_typed_util.attr(element, "w:name");
+			state.bookmarkEvents.push({
+				id,
+				name: name === void 0 ? void 0 : require_typed_util.decodeEntities(name),
+				kind: "start",
+				index: leading ? paragraphIndex : endIndex,
+				qualified: leading || trailing,
+				order: state.order++
+			});
+			return;
+		}
+		state.bookmarkEvents.push({
+			id,
+			name: void 0,
+			kind: "end",
+			index: trailing ? endIndex : paragraphIndex,
+			qualified: leading || trailing,
+			order: state.order++
+		});
+	});
+}
+function scanParagraphFields(index, paragraphIndex, endIndex, state) {
+	const content = require_typed_docx_constructs.contentBearingChildren(index);
+	content.forEach((child, position) => {
+		if (child.tag === "w:fldSimple") {
+			if (content.length === 1) state.extents.push({
+				startIndex: paragraphIndex,
+				endIndex,
+				order: state.order++,
+				descriptor: {
+					kind: "field",
+					instruction: require_typed_util.decodeEntities(require_typed_util.attr(child, "w:instr") ?? "")
+				}
+			});
+			return;
+		}
+		if (child.tag !== "w:r") return;
+		const type = require_typed_docx_constructs.fieldCharType(child);
+		if (type === "begin") {
+			state.openFields.push({
+				instruction: "",
+				inCode: true,
+				startIndex: paragraphIndex,
+				qualifiedStart: position === 0,
+				order: state.order++
+			});
+			return;
+		}
+		if (type === "separate") {
+			const open = state.openFields[state.openFields.length - 1];
+			if (open !== void 0) open.inCode = false;
+			return;
+		}
+		if (type === "end") {
+			const open = state.openFields.pop();
+			if (open !== void 0 && open.qualifiedStart && position === content.length - 1) state.extents.push({
+				startIndex: open.startIndex,
+				endIndex,
+				order: open.order,
+				descriptor: {
+					kind: "field",
+					instruction: open.instruction
+				}
+			});
+			return;
+		}
+		const open = state.openFields[state.openFields.length - 1];
+		if (open?.inCode === true) open.instruction += require_typed_docx_constructs.runInstructionText(child);
+	});
+}
+function collectParagraph(paragraph, ctx, state, carryDeletions) {
+	const index = require_typed_docx_constructs.indexParagraphContent(paragraph);
+	const tracked = wholeParagraphTrackedChange(index);
+	const paragraphDeleted = carryDeletions || tracked !== void 0 && require_typed_docx_constructs.isDeletedChange(tracked.change);
+	if (hasPageBreakBefore(paragraph)) state.blocks.push({ kind: "pageBreak" });
+	const paragraphIndex = state.blocks.length;
+	state.blocks.push(readParagraph(paragraph, ctx, paragraphDeleted));
+	state.blocks.push(...readParagraphImages(paragraph, ctx, paragraphDeleted));
+	const endIndex = state.blocks.length;
+	if (tracked !== void 0) state.extents.push({
+		startIndex: paragraphIndex,
+		endIndex,
+		order: state.order++,
+		descriptor: require_typed_docx_constructs.readProvenanceDescriptor(tracked.element, tracked.change)
+	});
+	recordParagraphBookmarks(index, paragraphIndex, endIndex, state);
+	scanParagraphFields(index, paragraphIndex, endIndex, state);
+	const pPr = require_typed_util.childrenWithTag(paragraph, "w:pPr")[0];
+	const sectPr = pPr === void 0 ? void 0 : require_typed_util.childrenWithTag(pPr, "w:sectPr")[0];
+	if (sectPr !== void 0) state.sectionBreaks.push({
+		index: state.blocks.length,
+		sectPr
+	});
+}
+function collectFlowNodes(nodes, ctx, state, carryDeletions) {
 	for (const node of nodes) {
 		if (node.type !== "element") continue;
 		if (node.tag === "w:p") {
-			if (hasPageBreakBefore(node)) blocks.push({ kind: "pageBreak" });
-			blocks.push(readParagraph(node, context, rels));
-			blocks.push(...readParagraphImages(node, rels, pkg));
-		} else if (node.tag === "w:tbl") blocks.push(readTable(node, context, rels, pkg));
-		else if (node.tag === "w:sdt") {
+			collectParagraph(node, ctx, state, carryDeletions);
+			continue;
+		}
+		if (node.tag === "w:tbl") {
+			state.blocks.push(readTable(node, ctx, carryDeletions));
+			continue;
+		}
+		if (node.tag === "w:sdt") {
+			const order = state.order++;
+			const startIndex = state.blocks.length;
 			const sdtContent = require_typed_util.childrenWithTag(node, "w:sdtContent")[0];
-			if (sdtContent !== void 0) blocks.push(...readBodyBlocks(sdtContent.children, context, rels, pkg));
-		} else if (node.tag === "w:ins") blocks.push(...readBodyBlocks(node.children, context, rels, pkg));
-		else if (node.tag === "mc:AlternateContent") {
+			if (sdtContent !== void 0) collectFlowNodes(sdtContent.children, ctx, state, carryDeletions);
+			state.extents.push({
+				startIndex,
+				endIndex: state.blocks.length,
+				order,
+				descriptor: require_typed_docx_constructs.readContentControlDescriptor(node)
+			});
+			continue;
+		}
+		const change = require_typed_docx_constructs.PROVENANCE_CHANGE_BY_TAG.get(node.tag);
+		if (change !== void 0) {
+			const order = state.order++;
+			const startIndex = state.blocks.length;
+			collectFlowNodes(node.children, ctx, state, carryDeletions || require_typed_docx_constructs.isDeletedChange(change));
+			state.extents.push({
+				startIndex,
+				endIndex: state.blocks.length,
+				order,
+				descriptor: require_typed_docx_constructs.readProvenanceDescriptor(node, change)
+			});
+			continue;
+		}
+		if (node.tag === "mc:AlternateContent") {
 			const target = require_typed_util.childrenWithTag(node, "mc:Fallback")[0] ?? require_typed_util.childrenWithTag(node, "mc:Choice")[0];
-			if (target !== void 0) blocks.push(...readBodyBlocks(target.children, context, rels, pkg));
+			if (target !== void 0) collectFlowNodes(target.children, ctx, state, carryDeletions);
+			continue;
 		}
-	}
-	return blocks;
-}
-function readSections(body, context, rels, pkg) {
-	const sections = [];
-	let currentBlocks = [];
-	for (const node of body.children) {
-		if (node.type !== "element") continue;
-		if (node.tag === "w:sectPr") {
-			sections.push({
-				pageSize: readPageSize(node),
-				margins: readMargins(node),
-				blocks: currentBlocks
+		if (node.tag === "w:bookmarkStart") {
+			const id = require_typed_util.attr(node, "w:id");
+			const name = require_typed_util.attr(node, "w:name");
+			if (id !== void 0) state.bookmarkEvents.push({
+				id,
+				name: name === void 0 ? void 0 : require_typed_util.decodeEntities(name),
+				kind: "start",
+				index: state.blocks.length,
+				qualified: true,
+				order: state.order++
 			});
-			currentBlocks = [];
 			continue;
 		}
-		if (node.tag === "w:p") {
-			const pPr = require_typed_util.childrenWithTag(node, "w:pPr")[0];
-			const sectPr = pPr === void 0 ? void 0 : require_typed_util.childrenWithTag(pPr, "w:sectPr")[0];
-			if (hasPageBreakBefore(node)) currentBlocks.push({ kind: "pageBreak" });
-			currentBlocks.push(readParagraph(node, context, rels));
-			currentBlocks.push(...readParagraphImages(node, rels, pkg));
-			if (sectPr !== void 0) {
-				sections.push({
-					pageSize: readPageSize(sectPr),
-					margins: readMargins(sectPr),
-					blocks: currentBlocks
-				});
-				currentBlocks = [];
-			}
+		if (node.tag === "w:bookmarkEnd") {
+			const id = require_typed_util.attr(node, "w:id");
+			if (id !== void 0) state.bookmarkEvents.push({
+				id,
+				name: void 0,
+				kind: "end",
+				index: state.blocks.length,
+				qualified: true,
+				order: state.order++
+			});
 			continue;
 		}
-		currentBlocks.push(...readBodyBlocks([node], context, rels, pkg));
+		if (node.tag === "w:sectPr") state.sectionBreaks.push({
+			index: state.blocks.length,
+			sectPr: node
+		});
 	}
-	if (currentBlocks.length > 0 || sections.length === 0) sections.push({
-		pageSize: document_schema_js.PAGE_SIZE_LETTER,
-		margins: DEFAULT_MARGINS,
-		blocks: currentBlocks
-	});
+}
+function readBlockScope(nodes, ctx, carryDeletions) {
+	const state = newFlowState();
+	collectFlowNodes(nodes, ctx, state, carryDeletions);
+	return require_typed_docx_constructs.insertConstructMarkers(state.blocks, [...state.extents, ...resolveBookmarkExtents(state.bookmarkEvents)]);
+}
+function readSections(body, ctx) {
+	const state = newFlowState();
+	collectFlowNodes(body.children, ctx, state, false);
+	const extents = [...state.extents, ...resolveBookmarkExtents(state.bookmarkEvents)];
+	function sliceSection(pageSize, margins, from, to) {
+		const contained = extents.filter((extent) => extent.startIndex >= from && extent.endIndex <= to).map((extent) => ({
+			...extent,
+			startIndex: extent.startIndex - from,
+			endIndex: extent.endIndex - from
+		}));
+		return {
+			pageSize,
+			margins,
+			blocks: require_typed_docx_constructs.insertConstructMarkers(state.blocks.slice(from, to), contained)
+		};
+	}
+	const sections = [];
+	let from = 0;
+	for (const sectionBreak of state.sectionBreaks) {
+		sections.push(sliceSection(readPageSize(sectionBreak.sectPr), readMargins(sectionBreak.sectPr), from, sectionBreak.index));
+		from = sectionBreak.index;
+	}
+	if (from < state.blocks.length || sections.length === 0) sections.push(sliceSection(document_schema_js.PAGE_SIZE_LETTER, DEFAULT_MARGINS, from, state.blocks.length));
 	sections.forEach((section, sectionIndex) => require_typed_shared_source_path.assignSourcePaths(section.blocks, `sections[${sectionIndex}]`));
 	return sections;
 }
@@ -424,13 +621,17 @@ function readDocx(pkg) {
 	const body = require_typed_util.childrenWithTag(documentRoot, "w:body")[0];
 	if (body === void 0) throw new Error(`readDocx: ${DOCUMENT_PART_PATH} has no w:body element`);
 	const docRels = require_typed_util.resolveRelationships(pkg, DOCUMENT_PART_PATH);
-	const context = {
-		stylesRoot: require_typed_util.rootElement(pkg.parts[STYLES_PART_PATH]),
-		theme: readDocumentTheme(pkg, docRels)
+	const ctx = {
+		styles: {
+			stylesRoot: require_typed_util.rootElement(pkg.parts[STYLES_PART_PATH]),
+			theme: readDocumentTheme(pkg, docRels)
+		},
+		rels: docRels,
+		pkg
 	};
 	return {
 		metadata: require_typed_shared_metadata.readCoreProperties(pkg),
-		sections: readSections(body, context, docRels, pkg),
+		sections: readSections(body, ctx),
 		comments: readComments(pkg),
 		footnotes: readFootnotes(pkg),
 		headers: readHeaderFooterText(pkg, "word/header"),