ooxml.js 2.7.0 → 2.8.1

package/README.md

@@ -198,7 +198,7 @@ const out = encodeCompactPackage(compact); // CompactPackage -> OOXML bytes dire
 
 ```sh
 pnpm build          # tsdown -> dist/ (one ESM + CJS + .d.ts set per source module, via tsdown.config.ts)
-pnpm lint           # eslint . --max-warnings 0
+pnpm lint           # eslint . --fix --cache --max-warnings 0
 pnpm typecheck      # tsc --noEmit
 pnpm test           # vitest run
 pnpm test:watch     # vitest

package/dist/typed/docx/read.cjs

@@ -266,10 +266,18 @@ function readRawCell(tc, context, rels, pkg) {
 		blocks: readBodyBlocks(tc.children, context, rels, pkg)
 	};
 }
+function readRowHeightPt(tr) {
+	const trPr = require_typed_util.childrenWithTag(tr, "w:trPr")[0];
+	if (trPr === void 0) return;
+	const trHeight = require_typed_util.childrenWithTag(trPr, "w:trHeight")[0];
+	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) {
 	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 rawRows = require_typed_util.childrenWithTag(tbl, "w:tr").map((tr) => require_typed_util.childrenWithTag(tr, "w:tc").map((tc) => readRawCell(tc, context, rels, pkg)));
+	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 rowColumnIndices = rawRows.map((row) => {
 		const indices = [];
 		let col = 0;
@@ -282,23 +290,26 @@ function readTable(tbl, context, rels, pkg) {
 	return {
 		kind: "table",
 		columnWidthsPt,
-		rows: rawRows.map((row, rowIndex) => ({ cells: row.map((cell, cellIndex) => {
-			if (cell.isVMergeContinuation) return { blocks: [] };
-			const colIndex = rowColumnIndices[rowIndex][cellIndex];
-			let rowSpan = 1;
-			for (let r = rowIndex + 1; r < rawRows.length; r++) {
-				const matchIndex = rowColumnIndices[r].indexOf(colIndex);
-				if (!(matchIndex === -1 ? void 0 : rawRows[r][matchIndex])?.isVMergeContinuation) break;
-				rowSpan++;
-			}
-			return {
-				blocks: cell.blocks,
-				colSpan: cell.gridSpan > 1 ? cell.gridSpan : void 0,
-				rowSpan: rowSpan > 1 ? rowSpan : void 0,
-				background: cell.background,
-				borders: cell.borders
-			};
-		}) }))
+		rows: rawRows.map((row, rowIndex) => ({
+			heightPt: readRowHeightPt(trs[rowIndex]),
+			cells: row.map((cell, cellIndex) => {
+				if (cell.isVMergeContinuation) return { blocks: [] };
+				const colIndex = rowColumnIndices[rowIndex][cellIndex];
+				let rowSpan = 1;
+				for (let r = rowIndex + 1; r < rawRows.length; r++) {
+					const matchIndex = rowColumnIndices[r].indexOf(colIndex);
+					if (!(matchIndex === -1 ? void 0 : rawRows[r][matchIndex])?.isVMergeContinuation) break;
+					rowSpan++;
+				}
+				return {
+					blocks: cell.blocks,
+					colSpan: cell.gridSpan > 1 ? cell.gridSpan : void 0,
+					rowSpan: rowSpan > 1 ? rowSpan : void 0,
+					background: cell.background,
+					borders: cell.borders
+				};
+			})
+		}))
 	};
 }
 function readBodyBlocks(nodes, context, rels, pkg) {

package/dist/typed/docx/read.js

@@ -265,10 +265,18 @@ function readRawCell(tc, context, rels, pkg) {
 		blocks: readBodyBlocks(tc.children, context, rels, pkg)
 	};
 }
+function readRowHeightPt(tr) {
+	const trPr = childrenWithTag(tr, "w:trPr")[0];
+	if (trPr === void 0) return;
+	const trHeight = childrenWithTag(trPr, "w:trHeight")[0];
+	const val = trHeight === void 0 ? void 0 : attr(trHeight, "w:val");
+	return val === void 0 ? void 0 : twipsToPt(Number(val));
+}
 function readTable(tbl, context, rels, pkg) {
 	const tblGrid = childrenWithTag(tbl, "w:tblGrid")[0];
 	const columnWidthsPt = tblGrid === void 0 ? [] : childrenWithTag(tblGrid, "w:gridCol").map((col) => twipsToPt(Number(attr(col, "w:w") ?? "0")));
-	const rawRows = childrenWithTag(tbl, "w:tr").map((tr) => childrenWithTag(tr, "w:tc").map((tc) => readRawCell(tc, context, rels, pkg)));
+	const trs = childrenWithTag(tbl, "w:tr");
+	const rawRows = trs.map((tr) => childrenWithTag(tr, "w:tc").map((tc) => readRawCell(tc, context, rels, pkg)));
 	const rowColumnIndices = rawRows.map((row) => {
 		const indices = [];
 		let col = 0;
@@ -281,23 +289,26 @@ function readTable(tbl, context, rels, pkg) {
 	return {
 		kind: "table",
 		columnWidthsPt,
-		rows: rawRows.map((row, rowIndex) => ({ cells: row.map((cell, cellIndex) => {
-			if (cell.isVMergeContinuation) return { blocks: [] };
-			const colIndex = rowColumnIndices[rowIndex][cellIndex];
-			let rowSpan = 1;
-			for (let r = rowIndex + 1; r < rawRows.length; r++) {
-				const matchIndex = rowColumnIndices[r].indexOf(colIndex);
-				if (!(matchIndex === -1 ? void 0 : rawRows[r][matchIndex])?.isVMergeContinuation) break;
-				rowSpan++;
-			}
-			return {
-				blocks: cell.blocks,
-				colSpan: cell.gridSpan > 1 ? cell.gridSpan : void 0,
-				rowSpan: rowSpan > 1 ? rowSpan : void 0,
-				background: cell.background,
-				borders: cell.borders
-			};
-		}) }))
+		rows: rawRows.map((row, rowIndex) => ({
+			heightPt: readRowHeightPt(trs[rowIndex]),
+			cells: row.map((cell, cellIndex) => {
+				if (cell.isVMergeContinuation) return { blocks: [] };
+				const colIndex = rowColumnIndices[rowIndex][cellIndex];
+				let rowSpan = 1;
+				for (let r = rowIndex + 1; r < rawRows.length; r++) {
+					const matchIndex = rowColumnIndices[r].indexOf(colIndex);
+					if (!(matchIndex === -1 ? void 0 : rawRows[r][matchIndex])?.isVMergeContinuation) break;
+					rowSpan++;
+				}
+				return {
+					blocks: cell.blocks,
+					colSpan: cell.gridSpan > 1 ? cell.gridSpan : void 0,
+					rowSpan: rowSpan > 1 ? rowSpan : void 0,
+					background: cell.background,
+					borders: cell.borders
+				};
+			})
+		}))
 	};
 }
 function readBodyBlocks(nodes, context, rels, pkg) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ooxml.js",
-  "version": "2.7.0",
+  "version": "2.8.1",
   "description": "Type-safe, lossless round-trip conversion between OOXML packages (docx, pptx, xlsx) and JSON, built on Zod 4 codecs.",
   "type": "module",
   "repository": {
@@ -47,7 +47,7 @@
   "scripts": {
     "build": "tsdown",
     "prepublishOnly": "pnpm run lint && pnpm run typecheck && tsdown && publint && attw --pack",
-    "lint": "eslint . --max-warnings 0",
+    "lint": "eslint . --fix --cache --max-warnings 0",
     "typecheck": "tsc --noEmit",
     "test": "vitest run --project unit",
     "test:watch": "vitest --project unit",