ooxml.js 4.3.0 → 4.4.0

package/dist/{read-Di5UfiSh.cjs → read-D-L3dItC.cjs}

@@ -22,6 +22,7 @@ const PptxDocumentSchema = zod.z.object({
 	slides: zod.z.array(document_schema_js.ContentSlideSchema)
 });
 const PRESENTATION_PATH = "ppt/presentation.xml";
+const SLIDE_REL_TYPE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide";
 const TABLE_GRAPHIC_URI = "http://schemas.openxmlformats.org/drawingml/2006/table";
 const CHART_GRAPHIC_URI = "http://schemas.openxmlformats.org/drawingml/2006/chart";
 const DIAGRAM_GRAPHIC_URI = "http://schemas.openxmlformats.org/drawingml/2006/diagram";
@@ -78,6 +79,14 @@ function readHyperlink(rPr, slideRels) {
 	const rel = rId === void 0 ? void 0 : slideRels.get(rId);
 	return rel?.targetMode === "External" ? rel.target : void 0;
 }
+function readInternalSlideJump(runEl, slideRels) {
+	const rPr = require_typed_util.childrenWithTag(runEl, "a:rPr")[0];
+	if (rPr === void 0) return;
+	const hlink = require_typed_util.childrenWithTag(rPr, "a:hlinkClick")[0];
+	const rId = hlink === void 0 ? void 0 : require_typed_util.attr(hlink, "r:id");
+	const rel = rId === void 0 ? void 0 : slideRels.get(rId);
+	return rel !== void 0 && rel.targetMode !== "External" && rel.type === SLIDE_REL_TYPE ? rel.target : void 0;
+}
 function readRun$1(runEl, cascadeBase, context, slideRels) {
 	const rPr = require_typed_util.childrenWithTag(runEl, "a:rPr")[0];
 	const merged = mergeRunProperties(cascadeBase, rPr === void 0 ? {} : require_typed_pptx_inherit.readRunPropertiesFromElement(rPr, context));
@@ -125,16 +134,47 @@ function readParagraph$1(pEl, placeholderType, context, slideRels) {
 	const pPrDefRPr = pPr === void 0 ? void 0 : require_typed_util.childrenWithTag(pPr, "a:defRPr")[0];
 	const paragraphDefaults = pPrDefRPr === void 0 ? masterDefaults : mergeRunProperties(masterDefaults, require_typed_pptx_inherit.readRunPropertiesFromElement(pPrDefRPr, context));
 	const runs = [];
+	const fieldExtents = [];
+	const linkExtents = [];
 	for (const child of pEl.children) {
 		if (child.type !== "element") continue;
-		if (child.tag === "a:r" || child.tag === "a:fld") runs.push(readRun$1(child, paragraphDefaults, context, slideRels));
-		else if (child.tag === "a:br") runs.push({ text: "\n" });
+		if (child.tag === "a:r" || child.tag === "a:fld") {
+			runs.push(readRun$1(child, paragraphDefaults, context, slideRels));
+			if (child.tag === "a:fld") {
+				const type = require_typed_util.attr(child, "type");
+				if (type !== void 0) {
+					const cached = require_typed_util.childrenWithTag(child, "a:t")[0];
+					fieldExtents.push({
+						descriptor: {
+							kind: "field",
+							instruction: type,
+							cachedResult: cached === void 0 ? "" : require_typed_util.textContent(cached)
+						},
+						startRun: runs.length - 1,
+						endRun: runs.length
+					});
+				}
+			}
+			const jumpTarget = readInternalSlideJump(child, slideRels);
+			if (jumpTarget !== void 0) linkExtents.push({
+				descriptor: {
+					kind: "link",
+					target: {
+						kind: "internal",
+						anchor: jumpTarget
+					}
+				},
+				startRun: runs.length - 1,
+				endRun: runs.length
+			});
+		} else if (child.tag === "a:br") runs.push({ text: "\n" });
 	}
 	const marL = pPr === void 0 ? void 0 : require_typed_util.attr(pPr, "marL");
 	const indent = pPr === void 0 ? void 0 : require_typed_util.attr(pPr, "indent");
 	return {
 		kind: "paragraph",
 		runs,
+		...fieldExtents.length + linkExtents.length > 0 ? { constructs: [...fieldExtents, ...linkExtents] } : {},
 		alignment: pPr === void 0 ? void 0 : readAlignment(require_typed_util.attr(pPr, "algn")),
 		list: outlineLevel === void 0 ? void 0 : { level: outlineLevel },
 		spacingBeforePt: readAbsoluteSpacingPt(pPr === void 0 ? void 0 : require_typed_util.childrenWithTag(pPr, "a:spcBef")[0]),
@@ -492,20 +532,42 @@ function readNestedDocument(objectKind, nested) {
 //#endregion
 //#region src/typed/docx/read.ts
 const CommentSchema = zod.z.object({
+	id: zod.z.string().optional(),
 	author: zod.z.string().optional(),
 	text: zod.z.string()
 });
 const FootnoteSchema = zod.z.object({
+	id: zod.z.string().optional(),
 	type: zod.z.string().optional(),
 	text: zod.z.string()
 });
+const HeaderFooterPartSchema = zod.z.object({
+	path: zod.z.string(),
+	kind: zod.z.enum(["header", "footer"]),
+	blocks: zod.z.array(document_schema_js.ContentBlockSchema)
+});
+const SectionHeaderFooterReferencesSchema = zod.z.object({
+	header: zod.z.partialRecord(zod.z.enum([
+		"default",
+		"first",
+		"even"
+	]), zod.z.string()).optional(),
+	footer: zod.z.partialRecord(zod.z.enum([
+		"default",
+		"first",
+		"even"
+	]), zod.z.string()).optional()
+});
 const DocxDocumentSchema = zod.z.object({
 	metadata: require_typed_shared_metadata.DocumentMetadataSchema,
 	sections: zod.z.array(document_schema_js.ContentSectionSchema),
 	comments: zod.z.array(CommentSchema),
 	footnotes: zod.z.array(FootnoteSchema),
+	endnotes: zod.z.array(FootnoteSchema),
 	headers: zod.z.array(zod.z.string()),
 	footers: zod.z.array(zod.z.string()),
+	headerFooterParts: zod.z.array(HeaderFooterPartSchema),
+	sectionHeaderFooters: zod.z.array(SectionHeaderFooterReferencesSchema),
 	numbering: zod.z.record(zod.z.string(), require_typed_docx_numbering.NumberingDefinitionSchema)
 });
 const DOCUMENT_PART_PATH = "word/document.xml";
@@ -541,6 +603,11 @@ function readMargins(sectPr) {
 		leftPt: left === void 0 ? DEFAULT_MARGIN_PT : require_typed_shared_units.twipsToPt(Number(left))
 	};
 }
+function readSectionBreakType(sectPr) {
+	const type = require_typed_util.childrenWithTag(sectPr, "w:type")[0];
+	const val = type === void 0 ? void 0 : require_typed_util.attr(type, "w:val");
+	return val === "nextPage" || val === "continuous" || val === "evenPage" || val === "oddPage" ? val : void 0;
+}
 function readListMembership(pPr) {
 	const numPr = pPr === void 0 ? void 0 : require_typed_util.childrenWithTag(pPr, "w:numPr")[0];
 	if (numPr === void 0) return;
@@ -662,62 +729,175 @@ function readRun(run, paragraph, context) {
 		color: props.color
 	};
 }
-function readParagraphRuns(paragraph, ctx, carryDeletions, halves) {
+function newParagraphRunEvents() {
+	return {
+		halves: [],
+		fields: [],
+		simpleFields: [],
+		pointAnchors: [],
+		links: []
+	};
+}
+function readParagraphRuns(paragraph, ctx, carryDeletions, events) {
 	const runs = [];
 	let fieldState = "none";
+	const openFields = [];
+	const recordRangeMarkerHalf = (node, family, start) => {
+		const id = require_typed_util.attr(node, "w:id");
+		if (id === void 0) return;
+		const name = require_typed_util.attr(node, "w:name");
+		events.halves.push({
+			element: node,
+			family,
+			id,
+			name: start && family === "bookmark" && name !== void 0 ? require_typed_util.decodeEntities(name) : void 0,
+			kind: start ? "start" : "end",
+			runPosition: runs.length
+		});
+	};
+	const recordReferenceAnchor = (run) => {
+		for (const child of run.children) {
+			if (child.type !== "element") continue;
+			const anchorType = child.tag === "w:footnoteReference" ? "footnote" : child.tag === "w:endnoteReference" ? "endnote" : child.tag === "w:commentReference" ? "comment" : void 0;
+			const id = anchorType === void 0 ? void 0 : require_typed_util.attr(child, "w:id");
+			if (anchorType !== void 0 && id !== void 0) events.pointAnchors.push({
+				descriptor: {
+					kind: "anchor",
+					anchorType,
+					name: id
+				},
+				runPosition: runs.length - 1
+			});
+		}
+	};
 	function walk(nodes, hyperlinkTarget) {
 		for (const node of nodes) {
 			if (node.type !== "element") continue;
 			if (node.tag === "w:r") {
 				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";
+					if (type === "begin") {
+						fieldState = "code";
+						openFields.push({
+							startRun: runs.length,
+							instruction: "",
+							beginElement: node,
+							formControl: require_typed_docx_constructs.readFormControlDescriptor(node)
+						});
+					} else if (type === "separate") fieldState = "result";
+					else if (type === "end") {
+						fieldState = "none";
+						const open = openFields.pop();
+						if (open !== void 0) events.fields.push({
+							descriptor: open.formControl ?? {
+								kind: "field",
+								instruction: open.instruction
+							},
+							startRun: open.startRun,
+							endRun: runs.length,
+							beginElement: open.beginElement,
+							endElement: node
+						});
+					}
+					continue;
+				}
+				if (fieldState === "code") {
+					const open = openFields[openFields.length - 1];
+					if (open !== void 0) open.instruction += require_typed_docx_constructs.runInstructionText(node);
 					continue;
 				}
-				if (fieldState === "code") continue;
 				const run = readRun(node, paragraph, ctx.styles);
 				runs.push(hyperlinkTarget === void 0 ? run : {
 					...run,
 					hyperlink: hyperlinkTarget
 				});
-			} else if (node.tag === "w:fldSimple") walk(node.children, hyperlinkTarget);
-			else if (node.tag === "w:hyperlink") {
+				recordReferenceAnchor(node);
+			} else if (node.tag === "w:fldSimple") {
+				const startRun = runs.length;
+				walk(node.children, hyperlinkTarget);
+				events.simpleFields.push({
+					descriptor: {
+						kind: "field",
+						instruction: require_typed_util.decodeEntities(require_typed_util.attr(node, "w:instr") ?? "")
+					},
+					startRun,
+					endRun: runs.length,
+					element: node
+				});
+			} else if (node.tag === "w:hyperlink") {
 				const rId = require_typed_util.attr(node, "r:id");
 				const target = rId === void 0 ? void 0 : ctx.rels.get(rId)?.target;
-				walk(node.children, target ?? hyperlinkTarget);
+				if (target === void 0) {
+					const anchor = require_typed_util.attr(node, "w:anchor");
+					const startRun = runs.length;
+					walk(node.children, hyperlinkTarget);
+					if (anchor !== void 0 && runs.length > startRun) events.links.push({
+						anchor: require_typed_util.decodeEntities(anchor),
+						startRun,
+						endRun: runs.length
+					});
+					continue;
+				}
+				walk(node.children, target);
 			} 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);
-			} else if (node.tag === "w:bookmarkStart" || node.tag === "w:bookmarkEnd") {
-				const id = require_typed_util.attr(node, "w:id");
-				if (id !== void 0) {
-					const name = require_typed_util.attr(node, "w:name");
-					halves.push({
-						element: node,
-						id,
-						name: node.tag === "w:bookmarkStart" && name !== void 0 ? require_typed_util.decodeEntities(name) : void 0,
-						kind: node.tag === "w:bookmarkStart" ? "start" : "end",
-						runPosition: runs.length
-					});
-				}
-			}
+			} else if (node.tag === "w:bookmarkStart" || node.tag === "w:bookmarkEnd") recordRangeMarkerHalf(node, "bookmark", node.tag === "w:bookmarkStart");
+			else if (node.tag === "w:commentRangeStart" || node.tag === "w:commentRangeEnd") recordRangeMarkerHalf(node, "comment", node.tag === "w:commentRangeStart");
 		}
 	}
 	walk(paragraph.children, void 0);
 	return runs;
 }
+function isBlockScopedField(event, index) {
+	const begin = index.elements.indexOf(event.beginElement);
+	const end = index.elements.indexOf(event.endElement);
+	return begin !== -1 && end !== -1 && begin === index.firstContentIndex && end === index.lastContentIndex;
+}
+function isBlockScopedSimpleField(event, index) {
+	const position = index.elements.indexOf(event.element);
+	return position !== -1 && index.firstContentIndex === position && index.lastContentIndex === position;
+}
+function assembleRunConstructs(events, index) {
+	const extents = require_typed_docx_constructs.runRangeMarkerExtents(events.halves, index);
+	for (const field of events.fields) if (!isBlockScopedField(field, index)) extents.push({
+		descriptor: field.descriptor,
+		startRun: field.startRun,
+		endRun: field.endRun
+	});
+	for (const simple of events.simpleFields) if (!isBlockScopedSimpleField(simple, index)) extents.push({
+		descriptor: simple.descriptor,
+		startRun: simple.startRun,
+		endRun: simple.endRun
+	});
+	for (const link of events.links) extents.push({
+		descriptor: {
+			kind: "link",
+			target: {
+				kind: "internal",
+				anchor: link.anchor
+			}
+		},
+		startRun: link.startRun,
+		endRun: link.endRun
+	});
+	for (const anchor of events.pointAnchors) extents.push({
+		descriptor: anchor.descriptor,
+		startRun: anchor.runPosition,
+		endRun: anchor.runPosition
+	});
+	return extents;
+}
 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, ctx.styles);
-	const halves = [];
-	const runs = readParagraphRuns(paragraph, ctx, carryDeletions, halves);
-	const constructs = require_typed_docx_constructs.runBookmarkExtents(halves, require_typed_docx_constructs.indexParagraphContent(paragraph));
+	const events = newParagraphRunEvents();
+	const runs = readParagraphRuns(paragraph, ctx, carryDeletions, events);
+	const constructs = assembleRunConstructs(events, require_typed_docx_constructs.indexParagraphContent(paragraph));
 	return {
 		kind: "paragraph",
 		runs,
@@ -847,16 +1027,17 @@ function newFlowState() {
 		blocks: [],
 		extents: [],
 		sectionBreaks: [],
-		bookmarkEvents: [],
+		rangeMarkerEvents: [],
 		openFields: [],
 		order: 0
 	};
 }
-function resolveBookmarkExtents(events) {
+function resolveRangeMarkerExtents(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]);
+		const key = `${event.family}:${event.id}`;
+		const existing = byId.get(key);
+		if (existing === void 0) byId.set(key, [event]);
 		else existing.push(event);
 	}
 	const extents = [];
@@ -866,12 +1047,17 @@ function resolveBookmarkExtents(events) {
 		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;
+		const descriptor = open.family === "comment" ? {
+			kind: "anchor",
+			anchorType: "comment",
+			name: open.id
+		} : open.name === void 0 ? void 0 : require_typed_docx_constructs.bookmarkAnchorDescriptor(open.name);
+		if (descriptor === 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)
+			descriptor
 		});
 	}
 	return extents;
@@ -887,18 +1073,21 @@ function wholeParagraphTrackedChange(index) {
 		change
 	};
 }
-function recordParagraphBookmarks(index, paragraphIndex, endIndex, state) {
+function recordParagraphRangeMarkers(index, paragraphIndex, endIndex, state) {
 	index.elements.forEach((element, position) => {
-		if (element.tag !== "w:bookmarkStart" && element.tag !== "w:bookmarkEnd") return;
+		if (element.tag !== "w:bookmarkStart" && element.tag !== "w:bookmarkEnd" && element.tag !== "w:commentRangeStart" && element.tag !== "w:commentRangeEnd") return;
 		const id = require_typed_util.attr(element, "w:id");
 		if (id === void 0) return;
+		const family = element.tag === "w:bookmarkStart" || element.tag === "w:bookmarkEnd" ? "bookmark" : "comment";
+		const start = element.tag === "w:bookmarkStart" || element.tag === "w:commentRangeStart";
 		const leading = index.firstContentIndex === -1 || position < index.firstContentIndex;
 		const trailing = index.lastContentIndex === -1 || position > index.lastContentIndex;
-		if (element.tag === "w:bookmarkStart") {
+		if (start) {
 			const name = require_typed_util.attr(element, "w:name");
-			state.bookmarkEvents.push({
+			state.rangeMarkerEvents.push({
+				family,
 				id,
-				name: name === void 0 ? void 0 : require_typed_util.decodeEntities(name),
+				name: family === "bookmark" && name !== void 0 ? require_typed_util.decodeEntities(name) : void 0,
 				kind: "start",
 				index: leading ? paragraphIndex : endIndex,
 				qualified: leading || trailing,
@@ -906,7 +1095,8 @@ function recordParagraphBookmarks(index, paragraphIndex, endIndex, state) {
 			});
 			return;
 		}
-		state.bookmarkEvents.push({
+		state.rangeMarkerEvents.push({
+			family,
 			id,
 			name: void 0,
 			kind: "end",
@@ -939,7 +1129,8 @@ function scanParagraphFields(index, paragraphIndex, endIndex, state) {
 				inCode: true,
 				startIndex: paragraphIndex,
 				qualifiedStart: position === 0,
-				order: state.order++
+				order: state.order++,
+				formControl: require_typed_docx_constructs.readFormControlDescriptor(child)
 			});
 			return;
 		}
@@ -954,7 +1145,7 @@ function scanParagraphFields(index, paragraphIndex, endIndex, state) {
 				startIndex: open.startIndex,
 				endIndex,
 				order: open.order,
-				descriptor: {
+				descriptor: open.formControl ?? {
 					kind: "field",
 					instruction: open.instruction
 				}
@@ -980,7 +1171,7 @@ function collectParagraph(paragraph, ctx, state, carryDeletions) {
 		order: state.order++,
 		descriptor: require_typed_docx_constructs.readProvenanceDescriptor(tracked.element, tracked.change)
 	});
-	recordParagraphBookmarks(index, paragraphIndex, endIndex, state);
+	recordParagraphRangeMarkers(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];
@@ -1031,12 +1222,13 @@ function collectFlowNodes(nodes, ctx, state, carryDeletions) {
 			if (target !== void 0) collectFlowNodes(target.children, ctx, state, carryDeletions);
 			continue;
 		}
-		if (node.tag === "w:bookmarkStart") {
+		if (node.tag === "w:bookmarkStart" || node.tag === "w:commentRangeStart") {
 			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({
+			if (id !== void 0) state.rangeMarkerEvents.push({
+				family: node.tag === "w:bookmarkStart" ? "bookmark" : "comment",
 				id,
-				name: name === void 0 ? void 0 : require_typed_util.decodeEntities(name),
+				name: node.tag === "w:bookmarkStart" && name !== void 0 ? require_typed_util.decodeEntities(name) : void 0,
 				kind: "start",
 				index: state.blocks.length,
 				qualified: true,
@@ -1044,9 +1236,10 @@ function collectFlowNodes(nodes, ctx, state, carryDeletions) {
 			});
 			continue;
 		}
-		if (node.tag === "w:bookmarkEnd") {
+		if (node.tag === "w:bookmarkEnd" || node.tag === "w:commentRangeEnd") {
 			const id = require_typed_util.attr(node, "w:id");
-			if (id !== void 0) state.bookmarkEvents.push({
+			if (id !== void 0) state.rangeMarkerEvents.push({
+				family: node.tag === "w:bookmarkEnd" ? "bookmark" : "comment",
 				id,
 				name: void 0,
 				kind: "end",
@@ -1065,13 +1258,46 @@ function collectFlowNodes(nodes, ctx, state, carryDeletions) {
 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)]);
+	return require_typed_docx_constructs.insertConstructMarkers(state.blocks, [...state.extents, ...resolveRangeMarkerExtents(state.rangeMarkerEvents)]);
+}
+function readSectionHeaderFooters(sectPr, ctx) {
+	const references = {};
+	for (const tag of ["w:headerReference", "w:footerReference"]) {
+		const slot = {};
+		for (const reference of require_typed_util.childrenWithTag(sectPr, tag)) {
+			const type = require_typed_util.attr(reference, "w:type");
+			const rId = require_typed_util.attr(reference, "r:id");
+			const target = rId === void 0 ? void 0 : ctx.rels.get(rId)?.target;
+			if ((type === "default" || type === "first" || type === "even") && target !== void 0) slot[type] = target;
+		}
+		if (Object.keys(slot).length > 0) references[tag === "w:headerReference" ? "header" : "footer"] = slot;
+	}
+	return references;
+}
+function readHeaderFooterParts(pkg, ctx, referencedPaths) {
+	const parts = [];
+	for (const path of [...referencedPaths].sort()) {
+		const root = require_typed_util.rootElement(pkg.parts[path]);
+		if (root === void 0) continue;
+		const kind = root.tag === "w:ftr" ? "footer" : "header";
+		const partCtx = {
+			styles: ctx.styles,
+			rels: require_typed_util.resolveRelationships(pkg, path),
+			pkg
+		};
+		parts.push({
+			path,
+			kind,
+			blocks: readBlockScope(root.children, partCtx, false)
+		});
+	}
+	return parts;
 }
 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 extents = [...state.extents, ...resolveRangeMarkerExtents(state.rangeMarkerEvents)];
+	function sliceSection(pageSize, margins, breakType, from, to) {
 		const contained = extents.filter((extent) => extent.startIndex >= from && extent.endIndex <= to).map((extent) => ({
 			...extent,
 			startIndex: extent.startIndex - from,
@@ -1080,18 +1306,27 @@ function readSections(body, ctx) {
 		return {
 			pageSize,
 			margins,
+			...breakType === void 0 ? {} : { breakType },
 			blocks: require_typed_docx_constructs.insertConstructMarkers(state.blocks.slice(from, to), contained)
 		};
 	}
 	const sections = [];
+	const headerFooters = [];
 	let from = 0;
 	for (const sectionBreak of state.sectionBreaks) {
-		sections.push(sliceSection(readPageSize(sectionBreak.sectPr), readMargins(sectionBreak.sectPr), from, sectionBreak.index));
+		sections.push(sliceSection(readPageSize(sectionBreak.sectPr), readMargins(sectionBreak.sectPr), readSectionBreakType(sectionBreak.sectPr), from, sectionBreak.index));
+		headerFooters.push(readSectionHeaderFooters(sectionBreak.sectPr, ctx));
 		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));
+	if (from < state.blocks.length || sections.length === 0) {
+		sections.push(sliceSection(document_schema_js.PAGE_SIZE_LETTER, DEFAULT_MARGINS, void 0, from, state.blocks.length));
+		headerFooters.push({});
+	}
 	sections.forEach((section, sectionIndex) => require_typed_shared_source_path.assignSourcePaths(section.blocks, `sections[${sectionIndex}]`));
-	return sections;
+	return {
+		sections,
+		headerFooters
+	};
 }
 function readDocumentTheme(pkg, docRels) {
 	for (const rel of docRels.values()) if (rel.type.endsWith(THEME_REL_SUFFIX)) {
@@ -1101,14 +1336,18 @@ function readDocumentTheme(pkg, docRels) {
 	return require_typed_shared_drawingml.EMPTY_THEME;
 }
 function readComment(comment) {
+	const id = require_typed_util.attr(comment, "w:id");
 	const author = require_typed_util.attr(comment, "w:author");
 	const result = { text: require_typed_util.elementsWithTag(comment.children, "w:t").map(require_typed_util.textContent).join("") };
+	if (id !== void 0) result.id = id;
 	if (author !== void 0) result.author = author;
 	return result;
 }
 function readFootnote(footnote) {
+	const id = require_typed_util.attr(footnote, "w:id");
 	const type = require_typed_util.attr(footnote, "w:type");
 	const result = { text: require_typed_util.elementsWithTag(footnote.children, "w:t").map(require_typed_util.textContent).join("") };
+	if (id !== void 0) result.id = id;
 	if (type !== void 0) result.type = type;
 	return result;
 }
@@ -1117,14 +1356,14 @@ function readComments(pkg) {
 	if (root === void 0) return [];
 	return require_typed_util.childrenWithTag(root, "w:comment").map(readComment);
 }
-function readFootnotes(pkg) {
-	const root = require_typed_util.rootElement(pkg.parts["word/footnotes.xml"]);
+function readNotesPart(pkg, path, noteTag) {
+	const root = require_typed_util.rootElement(pkg.parts[path]);
 	if (root === void 0) return [];
 	const out = [];
-	for (const fn of require_typed_util.childrenWithTag(root, "w:footnote")) {
-		const type = require_typed_util.attr(fn, "w:type");
+	for (const note of require_typed_util.childrenWithTag(root, noteTag)) {
+		const type = require_typed_util.attr(note, "w:type");
 		if (type === "separator" || type === "continuationSeparator") continue;
-		out.push(readFootnote(fn));
+		out.push(readFootnote(note));
 	}
 	return out;
 }
@@ -1152,13 +1391,19 @@ function readDocxContent(pkg) {
 		rels: docRels,
 		pkg
 	};
+	const { sections, headerFooters } = readSections(body, ctx);
+	const referencedPaths = /* @__PURE__ */ new Set();
+	for (const references of headerFooters) for (const slot of [references.header, references.footer]) for (const path of Object.values(slot ?? {})) referencedPaths.add(path);
 	return {
 		metadata: require_typed_shared_metadata.readCoreProperties(pkg),
-		sections: readSections(body, ctx),
+		sections,
 		comments: readComments(pkg),
-		footnotes: readFootnotes(pkg),
+		footnotes: readNotesPart(pkg, "word/footnotes.xml", "w:footnote"),
+		endnotes: readNotesPart(pkg, "word/endnotes.xml", "w:endnote"),
 		headers: readHeaderFooterText(pkg, "word/header"),
 		footers: readHeaderFooterText(pkg, "word/footer"),
+		headerFooterParts: readHeaderFooterParts(pkg, ctx, referencedPaths),
+		sectionHeaderFooters: headerFooters,
 		numbering: require_typed_docx_numbering.readNumberingDefinitions(pkg)
 	};
 }
@@ -1181,12 +1426,24 @@ Object.defineProperty(exports, "FootnoteSchema", {
 		return FootnoteSchema;
 	}
 });
+Object.defineProperty(exports, "HeaderFooterPartSchema", {
+	enumerable: true,
+	get: function() {
+		return HeaderFooterPartSchema;
+	}
+});
 Object.defineProperty(exports, "PptxDocumentSchema", {
 	enumerable: true,
 	get: function() {
 		return PptxDocumentSchema;
 	}
 });
+Object.defineProperty(exports, "SectionHeaderFooterReferencesSchema", {
+	enumerable: true,
+	get: function() {
+		return SectionHeaderFooterReferencesSchema;
+	}
+});
 Object.defineProperty(exports, "readDocxContent", {
 	enumerable: true,
 	get: function() {