ooxml.js 1.2.1 → 1.3.1

package/dist/index.cjs

@@ -310,6 +310,82 @@ function encodePackage(pkg) {
 	return zod.z.encode(packageCodec, pkg);
 }
 //#endregion
+//#region src/typed/util.ts
+function* walk(nodes) {
+	for (const node of nodes) {
+		yield node;
+		if (node.type === "element") yield* walk(node.children);
+	}
+}
+function elementsWithTag(nodes, tag) {
+	const out = [];
+	for (const node of walk(nodes)) if (node.type === "element" && node.tag === tag) out.push(node);
+	return out;
+}
+function childrenWithTag(element, tag) {
+	const out = [];
+	for (const child of element.children) if (child.type === "element" && child.tag === tag) out.push(child);
+	return out;
+}
+function attr(element, name) {
+	for (const a of element.attributes) if (a.name === name) return a.value;
+}
+function rootElement(part) {
+	if (part?.kind !== "xml") return;
+	for (const node of part.nodes) if (node.type === "element") return node;
+}
+function decodeEntities(value) {
+	return value.replace(/&(?:amp|lt|gt|quot|apos);/g, (entity) => {
+		switch (entity) {
+			case "&": return "&";
+			case "&lt;": return "<";
+			case "&gt;": return ">";
+			case "&quot;": return "\"";
+			case "&apos;": return "'";
+			default: return entity;
+		}
+	});
+}
+function textContent(element) {
+	let text = "";
+	for (const node of walk(element.children)) if (node.type === "text" || node.type === "cdata") text += node.value;
+	return decodeEntities(text);
+}
+function relsPathFor(partPath) {
+	const lastSlash = partPath.lastIndexOf("/");
+	return `${lastSlash === -1 ? "" : partPath.slice(0, lastSlash)}/_rels/${lastSlash === -1 ? partPath : partPath.slice(lastSlash + 1)}.rels`;
+}
+function resolveRelTarget$1(partPath, target) {
+	if (target.startsWith("/")) return target.slice(1);
+	const lastSlash = partPath.lastIndexOf("/");
+	const baseDir = lastSlash === -1 ? "" : partPath.slice(0, lastSlash);
+	const resolved = [];
+	for (const segment of `${baseDir}/${target}`.split("/")) {
+		if (segment === "" || segment === ".") continue;
+		if (segment === "..") resolved.pop();
+		else resolved.push(segment);
+	}
+	return resolved.join("/");
+}
+function resolveRelationships(pkg, partPath) {
+	const map = /* @__PURE__ */ new Map();
+	const rels = rootElement(pkg.parts[relsPathFor(partPath)]);
+	if (rels === void 0) return map;
+	for (const rel of childrenWithTag(rels, "Relationship")) {
+		const id = attr(rel, "Id");
+		const type = attr(rel, "Type");
+		const target = attr(rel, "Target");
+		if (id === void 0 || type === void 0 || target === void 0) continue;
+		const targetMode = attr(rel, "TargetMode");
+		map.set(id, {
+			type,
+			target: targetMode === "External" ? target : resolveRelTarget$1(partPath, target),
+			targetMode
+		});
+	}
+	return map;
+}
+//#endregion
 //#region src/compact.ts
 function isUnknownArray(value) {
 	return Array.isArray(value);
@@ -458,82 +534,6 @@ function encodeCompactPackage(cpkg) {
 	return zod.z.encode(compactPackageCodec, cpkg);
 }
 //#endregion
-//#region src/typed/util.ts
-function* walk(nodes) {
-	for (const node of nodes) {
-		yield node;
-		if (node.type === "element") yield* walk(node.children);
-	}
-}
-function elementsWithTag(nodes, tag) {
-	const out = [];
-	for (const node of walk(nodes)) if (node.type === "element" && node.tag === tag) out.push(node);
-	return out;
-}
-function childrenWithTag(element, tag) {
-	const out = [];
-	for (const child of element.children) if (child.type === "element" && child.tag === tag) out.push(child);
-	return out;
-}
-function attr(element, name) {
-	for (const a of element.attributes) if (a.name === name) return a.value;
-}
-function rootElement(part) {
-	if (part?.kind !== "xml") return;
-	for (const node of part.nodes) if (node.type === "element") return node;
-}
-function decodeEntities(value) {
-	return value.replace(/&(?:amp|lt|gt|quot|apos);/g, (entity) => {
-		switch (entity) {
-			case "&amp;": return "&";
-			case "&lt;": return "<";
-			case "&gt;": return ">";
-			case "&quot;": return "\"";
-			case "&apos;": return "'";
-			default: return entity;
-		}
-	});
-}
-function textContent(element) {
-	let text = "";
-	for (const node of walk(element.children)) if (node.type === "text" || node.type === "cdata") text += node.value;
-	return decodeEntities(text);
-}
-function relsPathFor(partPath) {
-	const lastSlash = partPath.lastIndexOf("/");
-	return `${lastSlash === -1 ? "" : partPath.slice(0, lastSlash)}/_rels/${lastSlash === -1 ? partPath : partPath.slice(lastSlash + 1)}.rels`;
-}
-function resolveRelTarget$1(partPath, target) {
-	if (target.startsWith("/")) return target.slice(1);
-	const lastSlash = partPath.lastIndexOf("/");
-	const baseDir = lastSlash === -1 ? "" : partPath.slice(0, lastSlash);
-	const resolved = [];
-	for (const segment of `${baseDir}/${target}`.split("/")) {
-		if (segment === "" || segment === ".") continue;
-		if (segment === "..") resolved.pop();
-		else resolved.push(segment);
-	}
-	return resolved.join("/");
-}
-function resolveRelationships(pkg, partPath) {
-	const map = /* @__PURE__ */ new Map();
-	const rels = rootElement(pkg.parts[relsPathFor(partPath)]);
-	if (rels === void 0) return map;
-	for (const rel of childrenWithTag(rels, "Relationship")) {
-		const id = attr(rel, "Id");
-		const type = attr(rel, "Type");
-		const target = attr(rel, "Target");
-		if (id === void 0 || type === void 0 || target === void 0) continue;
-		const targetMode = attr(rel, "TargetMode");
-		map.set(id, {
-			type,
-			target: targetMode === "External" ? target : resolveRelTarget$1(partPath, target),
-			targetMode
-		});
-	}
-	return map;
-}
-//#endregion
 //#region src/typed/docx.ts
 const RunSchema = zod.z.object({
 	text: zod.z.string(),
@@ -612,6 +612,17 @@ function readRow(row) {
 function readTable$1(table) {
 	return { rows: childrenWithTag(table, "w:tr").map(readRow) };
 }
+function* walkExcludingTables(nodes) {
+	for (const node of nodes) {
+		yield node;
+		if (node.type === "element" && node.tag !== "w:tbl") yield* walkExcludingTables(node.children);
+	}
+}
+function bodyParagraphElements(nodes) {
+	const out = [];
+	for (const node of walkExcludingTables(nodes)) if (node.type === "element" && node.tag === "w:p") out.push(node);
+	return out;
+}
 function readHyperlink(hyperlink, rels) {
 	const text = elementsWithTag(hyperlink.children, "w:t").map(textContent).join("");
 	const rid = attr(hyperlink, "r:id");
@@ -664,7 +675,7 @@ function readDocx(pkg) {
 	if (part.kind !== "xml") throw new Error("readDocx: word/document.xml is not an XML part");
 	const rels = resolveRelationships(pkg, "word/document.xml");
 	return {
-		paragraphs: elementsWithTag(part.nodes, "w:p").map(readParagraph),
+		paragraphs: bodyParagraphElements(part.nodes).map(readParagraph),
 		tables: elementsWithTag(part.nodes, "w:tbl").map(readTable$1),
 		hyperlinks: elementsWithTag(part.nodes, "w:hyperlink").map((h) => readHyperlink(h, rels)),
 		comments: readComments(pkg),
@@ -919,13 +930,17 @@ exports.XmlNodeSchema = XmlNodeSchema;
 exports.XmlPartSchema = XmlPartSchema;
 exports.XmlPiSchema = XmlPiSchema;
 exports.XmlTextSchema = XmlTextSchema;
+exports.attr = attr;
 exports.base64ToBytes = base64ToBytes;
 exports.buildXml = buildXml;
 exports.bytesToBase64 = bytesToBase64;
+exports.childrenWithTag = childrenWithTag;
 exports.compactCodec = compactCodec;
 exports.compactPackageCodec = compactPackageCodec;
 exports.decodeCompactPackage = decodeCompactPackage;
+exports.decodeEntities = decodeEntities;
 exports.decodePackage = decodePackage;
+exports.elementsWithTag = elementsWithTag;
 exports.encodeCompactPackage = encodeCompactPackage;
 exports.encodePackage = encodePackage;
 exports.fromCompact = fromCompact;
@@ -937,8 +952,12 @@ exports.parseXml = parseXml;
 exports.readDocx = readDocx;
 exports.readPptx = readPptx;
 exports.readXlsx = readXlsx;
+exports.resolveRelationships = resolveRelationships;
+exports.rootElement = rootElement;
 exports.serializePackage = serializePackage;
+exports.textContent = textContent;
 exports.toCompact = toCompact;
 exports.unzipPackage = unzipPackage;
+exports.walk = walk;
 exports.xmlCodec = xmlCodec;
 exports.zipPackage = zipPackage;

package/dist/index.d.cts

@@ -279,6 +279,21 @@ declare function zipPackage(parts: Record<string, Uint8Array<ArrayBuffer>>): Uin
 declare function bytesToBase64(bytes: Uint8Array<ArrayBuffer>): string;
 declare function base64ToBytes(b64: string): Uint8Array<ArrayBuffer>;
 //#endregion
+//#region src/typed/util.d.ts
+declare function walk(nodes: XmlNode[]): Generator<XmlNode>;
+declare function elementsWithTag(nodes: XmlNode[], tag: string): XmlElement[];
+declare function childrenWithTag(element: XmlElement, tag: string): XmlElement[];
+declare function attr(element: XmlElement, name: string): string | undefined;
+declare function rootElement(part: Part | undefined): XmlElement | undefined;
+declare function decodeEntities(value: string): string;
+declare function textContent(element: XmlElement): string;
+interface Relationship {
+  type: string;
+  target: string;
+  targetMode?: string;
+}
+declare function resolveRelationships(pkg: Package, partPath: string): Map<string, Relationship>;
+//#endregion
 //#region src/compact.d.ts
 type CompactAttrPairs = number[];
 type CompactElement = [0, number, CompactAttrPairs, CompactXmlNode[]];
@@ -578,4 +593,4 @@ declare const XlsxWorkbookSchema: z.ZodObject<{
 type XlsxWorkbook = z.infer<typeof XlsxWorkbookSchema>;
 declare function readXlsx(pkg: Package): XlsxWorkbook;
 //#endregion
-export { type Attribute, AttributeSchema, type BinaryPart, BinaryPartSchema, type Comment, CommentSchema, type CompactAttrPairs, type CompactPackage, CompactPackageSchema, type CompactPart, CompactPartSchema, type CompactXmlNode, CompactXmlNodeSchema, type DefinedName, DefinedNameSchema, type DocxDocument, DocxDocumentSchema, type Footnote, FootnoteSchema, type Hyperlink, HyperlinkSchema, type ListMembership, ListMembershipSchema, type Package, PackageSchema, type Paragraph, ParagraphSchema, type Part, PartSchema, type PptxPresentation, PptxPresentationSchema, type PptxTable, type PptxTableCell, PptxTableCellSchema, type PptxTableRow, PptxTableRowSchema, PptxTableSchema, type Run, RunSchema, type Shape, ShapeSchema, type Slide, SlideSchema, type Table, type TableCell, TableCellSchema, type TableRow, TableRowSchema, TableSchema, type XlsxCell, XlsxCellSchema, type XlsxSheet, XlsxSheetSchema, type XlsxWorkbook, XlsxWorkbookSchema, type XmlCdata, XmlCdataSchema, type XmlComment, XmlCommentSchema, type XmlDeclaration, XmlDeclarationSchema, type XmlElement, XmlElementSchema, type XmlNode, XmlNodeSchema, type XmlPart, XmlPartSchema, type XmlPi, XmlPiSchema, type XmlText, XmlTextSchema, base64ToBytes, buildXml, bytesToBase64, compactCodec, compactPackageCodec, decodeCompactPackage, decodePackage, encodeCompactPackage, encodePackage, fromCompact, isCompactXmlNode, isXmlNode, packageCodec, parsePackage, parseXml, readDocx, readPptx, readXlsx, serializePackage, toCompact, unzipPackage, xmlCodec, zipPackage };
+export { type Attribute, AttributeSchema, type BinaryPart, BinaryPartSchema, type Comment, CommentSchema, type CompactAttrPairs, type CompactPackage, CompactPackageSchema, type CompactPart, CompactPartSchema, type CompactXmlNode, CompactXmlNodeSchema, type DefinedName, DefinedNameSchema, type DocxDocument, DocxDocumentSchema, type Footnote, FootnoteSchema, type Hyperlink, HyperlinkSchema, type ListMembership, ListMembershipSchema, type Package, PackageSchema, type Paragraph, ParagraphSchema, type Part, PartSchema, type PptxPresentation, PptxPresentationSchema, type PptxTable, type PptxTableCell, PptxTableCellSchema, type PptxTableRow, PptxTableRowSchema, PptxTableSchema, type Relationship, type Run, RunSchema, type Shape, ShapeSchema, type Slide, SlideSchema, type Table, type TableCell, TableCellSchema, type TableRow, TableRowSchema, TableSchema, type XlsxCell, XlsxCellSchema, type XlsxSheet, XlsxSheetSchema, type XlsxWorkbook, XlsxWorkbookSchema, type XmlCdata, XmlCdataSchema, type XmlComment, XmlCommentSchema, type XmlDeclaration, XmlDeclarationSchema, type XmlElement, XmlElementSchema, type XmlNode, XmlNodeSchema, type XmlPart, XmlPartSchema, type XmlPi, XmlPiSchema, type XmlText, XmlTextSchema, attr, base64ToBytes, buildXml, bytesToBase64, childrenWithTag, compactCodec, compactPackageCodec, decodeCompactPackage, decodeEntities, decodePackage, elementsWithTag, encodeCompactPackage, encodePackage, fromCompact, isCompactXmlNode, isXmlNode, packageCodec, parsePackage, parseXml, readDocx, readPptx, readXlsx, resolveRelationships, rootElement, serializePackage, textContent, toCompact, unzipPackage, walk, xmlCodec, zipPackage };

package/dist/index.d.ts

@@ -279,6 +279,21 @@ declare function zipPackage(parts: Record<string, Uint8Array<ArrayBuffer>>): Uin
 declare function bytesToBase64(bytes: Uint8Array<ArrayBuffer>): string;
 declare function base64ToBytes(b64: string): Uint8Array<ArrayBuffer>;
 //#endregion
+//#region src/typed/util.d.ts
+declare function walk(nodes: XmlNode[]): Generator<XmlNode>;
+declare function elementsWithTag(nodes: XmlNode[], tag: string): XmlElement[];
+declare function childrenWithTag(element: XmlElement, tag: string): XmlElement[];
+declare function attr(element: XmlElement, name: string): string | undefined;
+declare function rootElement(part: Part | undefined): XmlElement | undefined;
+declare function decodeEntities(value: string): string;
+declare function textContent(element: XmlElement): string;
+interface Relationship {
+  type: string;
+  target: string;
+  targetMode?: string;
+}
+declare function resolveRelationships(pkg: Package, partPath: string): Map<string, Relationship>;
+//#endregion
 //#region src/compact.d.ts
 type CompactAttrPairs = number[];
 type CompactElement = [0, number, CompactAttrPairs, CompactXmlNode[]];
@@ -578,4 +593,4 @@ declare const XlsxWorkbookSchema: z.ZodObject<{
 type XlsxWorkbook = z.infer<typeof XlsxWorkbookSchema>;
 declare function readXlsx(pkg: Package): XlsxWorkbook;
 //#endregion
-export { type Attribute, AttributeSchema, type BinaryPart, BinaryPartSchema, type Comment, CommentSchema, type CompactAttrPairs, type CompactPackage, CompactPackageSchema, type CompactPart, CompactPartSchema, type CompactXmlNode, CompactXmlNodeSchema, type DefinedName, DefinedNameSchema, type DocxDocument, DocxDocumentSchema, type Footnote, FootnoteSchema, type Hyperlink, HyperlinkSchema, type ListMembership, ListMembershipSchema, type Package, PackageSchema, type Paragraph, ParagraphSchema, type Part, PartSchema, type PptxPresentation, PptxPresentationSchema, type PptxTable, type PptxTableCell, PptxTableCellSchema, type PptxTableRow, PptxTableRowSchema, PptxTableSchema, type Run, RunSchema, type Shape, ShapeSchema, type Slide, SlideSchema, type Table, type TableCell, TableCellSchema, type TableRow, TableRowSchema, TableSchema, type XlsxCell, XlsxCellSchema, type XlsxSheet, XlsxSheetSchema, type XlsxWorkbook, XlsxWorkbookSchema, type XmlCdata, XmlCdataSchema, type XmlComment, XmlCommentSchema, type XmlDeclaration, XmlDeclarationSchema, type XmlElement, XmlElementSchema, type XmlNode, XmlNodeSchema, type XmlPart, XmlPartSchema, type XmlPi, XmlPiSchema, type XmlText, XmlTextSchema, base64ToBytes, buildXml, bytesToBase64, compactCodec, compactPackageCodec, decodeCompactPackage, decodePackage, encodeCompactPackage, encodePackage, fromCompact, isCompactXmlNode, isXmlNode, packageCodec, parsePackage, parseXml, readDocx, readPptx, readXlsx, serializePackage, toCompact, unzipPackage, xmlCodec, zipPackage };
+export { type Attribute, AttributeSchema, type BinaryPart, BinaryPartSchema, type Comment, CommentSchema, type CompactAttrPairs, type CompactPackage, CompactPackageSchema, type CompactPart, CompactPartSchema, type CompactXmlNode, CompactXmlNodeSchema, type DefinedName, DefinedNameSchema, type DocxDocument, DocxDocumentSchema, type Footnote, FootnoteSchema, type Hyperlink, HyperlinkSchema, type ListMembership, ListMembershipSchema, type Package, PackageSchema, type Paragraph, ParagraphSchema, type Part, PartSchema, type PptxPresentation, PptxPresentationSchema, type PptxTable, type PptxTableCell, PptxTableCellSchema, type PptxTableRow, PptxTableRowSchema, PptxTableSchema, type Relationship, type Run, RunSchema, type Shape, ShapeSchema, type Slide, SlideSchema, type Table, type TableCell, TableCellSchema, type TableRow, TableRowSchema, TableSchema, type XlsxCell, XlsxCellSchema, type XlsxSheet, XlsxSheetSchema, type XlsxWorkbook, XlsxWorkbookSchema, type XmlCdata, XmlCdataSchema, type XmlComment, XmlCommentSchema, type XmlDeclaration, XmlDeclarationSchema, type XmlElement, XmlElementSchema, type XmlNode, XmlNodeSchema, type XmlPart, XmlPartSchema, type XmlPi, XmlPiSchema, type XmlText, XmlTextSchema, attr, base64ToBytes, buildXml, bytesToBase64, childrenWithTag, compactCodec, compactPackageCodec, decodeCompactPackage, decodeEntities, decodePackage, elementsWithTag, encodeCompactPackage, encodePackage, fromCompact, isCompactXmlNode, isXmlNode, packageCodec, parsePackage, parseXml, readDocx, readPptx, readXlsx, resolveRelationships, rootElement, serializePackage, textContent, toCompact, unzipPackage, walk, xmlCodec, zipPackage };

package/dist/index.js

@@ -309,6 +309,82 @@ function encodePackage(pkg) {
 	return z.encode(packageCodec, pkg);
 }
 //#endregion
+//#region src/typed/util.ts
+function* walk(nodes) {
+	for (const node of nodes) {
+		yield node;
+		if (node.type === "element") yield* walk(node.children);
+	}
+}
+function elementsWithTag(nodes, tag) {
+	const out = [];
+	for (const node of walk(nodes)) if (node.type === "element" && node.tag === tag) out.push(node);
+	return out;
+}
+function childrenWithTag(element, tag) {
+	const out = [];
+	for (const child of element.children) if (child.type === "element" && child.tag === tag) out.push(child);
+	return out;
+}
+function attr(element, name) {
+	for (const a of element.attributes) if (a.name === name) return a.value;
+}
+function rootElement(part) {
+	if (part?.kind !== "xml") return;
+	for (const node of part.nodes) if (node.type === "element") return node;
+}
+function decodeEntities(value) {
+	return value.replace(/&(?:amp|lt|gt|quot|apos);/g, (entity) => {
+		switch (entity) {
+			case "&": return "&";
+			case "&lt;": return "<";
+			case "&gt;": return ">";
+			case "&quot;": return "\"";
+			case "&apos;": return "'";
+			default: return entity;
+		}
+	});
+}
+function textContent(element) {
+	let text = "";
+	for (const node of walk(element.children)) if (node.type === "text" || node.type === "cdata") text += node.value;
+	return decodeEntities(text);
+}
+function relsPathFor(partPath) {
+	const lastSlash = partPath.lastIndexOf("/");
+	return `${lastSlash === -1 ? "" : partPath.slice(0, lastSlash)}/_rels/${lastSlash === -1 ? partPath : partPath.slice(lastSlash + 1)}.rels`;
+}
+function resolveRelTarget$1(partPath, target) {
+	if (target.startsWith("/")) return target.slice(1);
+	const lastSlash = partPath.lastIndexOf("/");
+	const baseDir = lastSlash === -1 ? "" : partPath.slice(0, lastSlash);
+	const resolved = [];
+	for (const segment of `${baseDir}/${target}`.split("/")) {
+		if (segment === "" || segment === ".") continue;
+		if (segment === "..") resolved.pop();
+		else resolved.push(segment);
+	}
+	return resolved.join("/");
+}
+function resolveRelationships(pkg, partPath) {
+	const map = /* @__PURE__ */ new Map();
+	const rels = rootElement(pkg.parts[relsPathFor(partPath)]);
+	if (rels === void 0) return map;
+	for (const rel of childrenWithTag(rels, "Relationship")) {
+		const id = attr(rel, "Id");
+		const type = attr(rel, "Type");
+		const target = attr(rel, "Target");
+		if (id === void 0 || type === void 0 || target === void 0) continue;
+		const targetMode = attr(rel, "TargetMode");
+		map.set(id, {
+			type,
+			target: targetMode === "External" ? target : resolveRelTarget$1(partPath, target),
+			targetMode
+		});
+	}
+	return map;
+}
+//#endregion
 //#region src/compact.ts
 function isUnknownArray(value) {
 	return Array.isArray(value);
@@ -457,82 +533,6 @@ function encodeCompactPackage(cpkg) {
 	return z.encode(compactPackageCodec, cpkg);
 }
 //#endregion
-//#region src/typed/util.ts
-function* walk(nodes) {
-	for (const node of nodes) {
-		yield node;
-		if (node.type === "element") yield* walk(node.children);
-	}
-}
-function elementsWithTag(nodes, tag) {
-	const out = [];
-	for (const node of walk(nodes)) if (node.type === "element" && node.tag === tag) out.push(node);
-	return out;
-}
-function childrenWithTag(element, tag) {
-	const out = [];
-	for (const child of element.children) if (child.type === "element" && child.tag === tag) out.push(child);
-	return out;
-}
-function attr(element, name) {
-	for (const a of element.attributes) if (a.name === name) return a.value;
-}
-function rootElement(part) {
-	if (part?.kind !== "xml") return;
-	for (const node of part.nodes) if (node.type === "element") return node;
-}
-function decodeEntities(value) {
-	return value.replace(/&(?:amp|lt|gt|quot|apos);/g, (entity) => {
-		switch (entity) {
-			case "&amp;": return "&";
-			case "&lt;": return "<";
-			case "&gt;": return ">";
-			case "&quot;": return "\"";
-			case "&apos;": return "'";
-			default: return entity;
-		}
-	});
-}
-function textContent(element) {
-	let text = "";
-	for (const node of walk(element.children)) if (node.type === "text" || node.type === "cdata") text += node.value;
-	return decodeEntities(text);
-}
-function relsPathFor(partPath) {
-	const lastSlash = partPath.lastIndexOf("/");
-	return `${lastSlash === -1 ? "" : partPath.slice(0, lastSlash)}/_rels/${lastSlash === -1 ? partPath : partPath.slice(lastSlash + 1)}.rels`;
-}
-function resolveRelTarget$1(partPath, target) {
-	if (target.startsWith("/")) return target.slice(1);
-	const lastSlash = partPath.lastIndexOf("/");
-	const baseDir = lastSlash === -1 ? "" : partPath.slice(0, lastSlash);
-	const resolved = [];
-	for (const segment of `${baseDir}/${target}`.split("/")) {
-		if (segment === "" || segment === ".") continue;
-		if (segment === "..") resolved.pop();
-		else resolved.push(segment);
-	}
-	return resolved.join("/");
-}
-function resolveRelationships(pkg, partPath) {
-	const map = /* @__PURE__ */ new Map();
-	const rels = rootElement(pkg.parts[relsPathFor(partPath)]);
-	if (rels === void 0) return map;
-	for (const rel of childrenWithTag(rels, "Relationship")) {
-		const id = attr(rel, "Id");
-		const type = attr(rel, "Type");
-		const target = attr(rel, "Target");
-		if (id === void 0 || type === void 0 || target === void 0) continue;
-		const targetMode = attr(rel, "TargetMode");
-		map.set(id, {
-			type,
-			target: targetMode === "External" ? target : resolveRelTarget$1(partPath, target),
-			targetMode
-		});
-	}
-	return map;
-}
-//#endregion
 //#region src/typed/docx.ts
 const RunSchema = z.object({
 	text: z.string(),
@@ -611,6 +611,17 @@ function readRow(row) {
 function readTable$1(table) {
 	return { rows: childrenWithTag(table, "w:tr").map(readRow) };
 }
+function* walkExcludingTables(nodes) {
+	for (const node of nodes) {
+		yield node;
+		if (node.type === "element" && node.tag !== "w:tbl") yield* walkExcludingTables(node.children);
+	}
+}
+function bodyParagraphElements(nodes) {
+	const out = [];
+	for (const node of walkExcludingTables(nodes)) if (node.type === "element" && node.tag === "w:p") out.push(node);
+	return out;
+}
 function readHyperlink(hyperlink, rels) {
 	const text = elementsWithTag(hyperlink.children, "w:t").map(textContent).join("");
 	const rid = attr(hyperlink, "r:id");
@@ -663,7 +674,7 @@ function readDocx(pkg) {
 	if (part.kind !== "xml") throw new Error("readDocx: word/document.xml is not an XML part");
 	const rels = resolveRelationships(pkg, "word/document.xml");
 	return {
-		paragraphs: elementsWithTag(part.nodes, "w:p").map(readParagraph),
+		paragraphs: bodyParagraphElements(part.nodes).map(readParagraph),
 		tables: elementsWithTag(part.nodes, "w:tbl").map(readTable$1),
 		hyperlinks: elementsWithTag(part.nodes, "w:hyperlink").map((h) => readHyperlink(h, rels)),
 		comments: readComments(pkg),
@@ -883,4 +894,4 @@ function readXlsx(pkg) {
 	};
 }
 //#endregion
-export { AttributeSchema, BinaryPartSchema, CommentSchema, CompactPackageSchema, CompactPartSchema, CompactXmlNodeSchema, DefinedNameSchema, DocxDocumentSchema, FootnoteSchema, HyperlinkSchema, ListMembershipSchema, PackageSchema, ParagraphSchema, PartSchema, PptxPresentationSchema, PptxTableCellSchema, PptxTableRowSchema, PptxTableSchema, RunSchema, ShapeSchema, SlideSchema, TableCellSchema, TableRowSchema, TableSchema, XlsxCellSchema, XlsxSheetSchema, XlsxWorkbookSchema, XmlCdataSchema, XmlCommentSchema, XmlDeclarationSchema, XmlElementSchema, XmlNodeSchema, XmlPartSchema, XmlPiSchema, XmlTextSchema, base64ToBytes, buildXml, bytesToBase64, compactCodec, compactPackageCodec, decodeCompactPackage, decodePackage, encodeCompactPackage, encodePackage, fromCompact, isCompactXmlNode, isXmlNode, packageCodec, parsePackage, parseXml, readDocx, readPptx, readXlsx, serializePackage, toCompact, unzipPackage, xmlCodec, zipPackage };
+export { AttributeSchema, BinaryPartSchema, CommentSchema, CompactPackageSchema, CompactPartSchema, CompactXmlNodeSchema, DefinedNameSchema, DocxDocumentSchema, FootnoteSchema, HyperlinkSchema, ListMembershipSchema, PackageSchema, ParagraphSchema, PartSchema, PptxPresentationSchema, PptxTableCellSchema, PptxTableRowSchema, PptxTableSchema, RunSchema, ShapeSchema, SlideSchema, TableCellSchema, TableRowSchema, TableSchema, XlsxCellSchema, XlsxSheetSchema, XlsxWorkbookSchema, XmlCdataSchema, XmlCommentSchema, XmlDeclarationSchema, XmlElementSchema, XmlNodeSchema, XmlPartSchema, XmlPiSchema, XmlTextSchema, attr, base64ToBytes, buildXml, bytesToBase64, childrenWithTag, compactCodec, compactPackageCodec, decodeCompactPackage, decodeEntities, decodePackage, elementsWithTag, encodeCompactPackage, encodePackage, fromCompact, isCompactXmlNode, isXmlNode, packageCodec, parsePackage, parseXml, readDocx, readPptx, readXlsx, resolveRelationships, rootElement, serializePackage, textContent, toCompact, unzipPackage, walk, xmlCodec, zipPackage };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ooxml.js",
-  "version": "1.2.1",
+  "version": "1.3.1",
   "description": "Type-safe, lossless round-trip conversion between OOXML packages (docx, pptx, xlsx) and JSON, built on Zod 4 codecs.",
   "type": "module",
   "repository": {