ooxml.js 2.6.3 → 2.6.4

package/dist/package-io/read.cjs

@@ -6,11 +6,13 @@ const require_zip = require("../zip.cjs");
 function parsePackage(bytes) {
 	const entries = require_zip.unzipPackage(bytes);
 	const parts = {};
-	for (const [path, partBytes] of Object.entries(entries)) if (looksLikeXml(partBytes)) parts[path] = {
-		kind: "xml",
-		nodes: require_xml_parse.parseXml(new TextDecoder("utf-8").decode(partBytes))
-	};
-	else parts[path] = {
+	for (const [path, partBytes] of Object.entries(entries)) if (looksLikeXml(partBytes)) {
+		const xml = new TextDecoder("utf-8").decode(partBytes);
+		parts[path] = {
+			kind: "xml",
+			nodes: require_xml_parse.parseXml(xml)
+		};
+	} else parts[path] = {
 		kind: "binary",
 		base64: require_util_base64.bytesToBase64(partBytes)
 	};

package/dist/package-io/read.js

@@ -5,11 +5,13 @@ import { unzipPackage } from "../zip.js";
 function parsePackage(bytes) {
 	const entries = unzipPackage(bytes);
 	const parts = {};
-	for (const [path, partBytes] of Object.entries(entries)) if (looksLikeXml(partBytes)) parts[path] = {
-		kind: "xml",
-		nodes: parseXml(new TextDecoder("utf-8").decode(partBytes))
-	};
-	else parts[path] = {
+	for (const [path, partBytes] of Object.entries(entries)) if (looksLikeXml(partBytes)) {
+		const xml = new TextDecoder("utf-8").decode(partBytes);
+		parts[path] = {
+			kind: "xml",
+			nodes: parseXml(xml)
+		};
+	} else parts[path] = {
 		kind: "binary",
 		base64: bytesToBase64(partBytes)
 	};

package/dist/typed/docx/read.cjs

@@ -107,7 +107,8 @@ function readDrawingImage(drawing, rels, pkg) {
 	const rel = rId === void 0 ? void 0 : rels.get(rId);
 	const mediaPart = rel === void 0 ? void 0 : pkg.parts[rel.target];
 	if (mediaPart?.kind !== "binary") return;
-	const format = require_image_sniff.sniffImageFormat(require_util_base64.base64ToBytes(mediaPart.base64));
+	const bytes = require_util_base64.base64ToBytes(mediaPart.base64);
+	const format = require_image_sniff.sniffImageFormat(bytes);
 	if (format === void 0) return;
 	const image = {
 		kind: "image",

package/dist/typed/docx/read.js

@@ -106,7 +106,8 @@ function readDrawingImage(drawing, rels, pkg) {
 	const rel = rId === void 0 ? void 0 : rels.get(rId);
 	const mediaPart = rel === void 0 ? void 0 : pkg.parts[rel.target];
 	if (mediaPart?.kind !== "binary") return;
-	const format = sniffImageFormat(base64ToBytes(mediaPart.base64));
+	const bytes = base64ToBytes(mediaPart.base64);
+	const format = sniffImageFormat(bytes);
 	if (format === void 0) return;
 	const image = {
 		kind: "image",

package/dist/typed/pptx/inherit.cjs

@@ -16,11 +16,13 @@ function resolveSlideInheritance(pkg, slidePath) {
 	const masterRoot = masterPath === void 0 ? void 0 : require_typed_util.rootElement(pkg.parts[masterPath]);
 	const themePath = masterPath === void 0 ? void 0 : findRelTarget(pkg, masterPath, THEME_REL_SUFFIX);
 	const themeRoot = themePath === void 0 ? void 0 : require_typed_util.rootElement(pkg.parts[themePath]);
+	const theme = themeRoot === void 0 ? require_typed_shared_drawingml.EMPTY_THEME : require_typed_shared_drawingml.readTheme(themeRoot);
+	const clrMapEl = masterRoot === void 0 ? void 0 : require_typed_util.childrenWithTag(masterRoot, "p:clrMap")[0];
 	return {
 		layoutRoot,
 		masterRoot,
-		theme: themeRoot === void 0 ? require_typed_shared_drawingml.EMPTY_THEME : require_typed_shared_drawingml.readTheme(themeRoot),
-		colorMap: require_typed_shared_drawingml.readColorMap(masterRoot === void 0 ? void 0 : require_typed_util.childrenWithTag(masterRoot, "p:clrMap")[0])
+		theme,
+		colorMap: require_typed_shared_drawingml.readColorMap(clrMapEl)
 	};
 }
 const TYPE_NORMALIZATION = /* @__PURE__ */ new Map([["ctrTitle", "title"], ["subTitle", "body"]]);

package/dist/typed/pptx/inherit.js

@@ -15,11 +15,13 @@ function resolveSlideInheritance(pkg, slidePath) {
 	const masterRoot = masterPath === void 0 ? void 0 : rootElement(pkg.parts[masterPath]);
 	const themePath = masterPath === void 0 ? void 0 : findRelTarget(pkg, masterPath, THEME_REL_SUFFIX);
 	const themeRoot = themePath === void 0 ? void 0 : rootElement(pkg.parts[themePath]);
+	const theme = themeRoot === void 0 ? EMPTY_THEME : readTheme(themeRoot);
+	const clrMapEl = masterRoot === void 0 ? void 0 : childrenWithTag(masterRoot, "p:clrMap")[0];
 	return {
 		layoutRoot,
 		masterRoot,
-		theme: themeRoot === void 0 ? EMPTY_THEME : readTheme(themeRoot),
-		colorMap: readColorMap(masterRoot === void 0 ? void 0 : childrenWithTag(masterRoot, "p:clrMap")[0])
+		theme,
+		colorMap: readColorMap(clrMapEl)
 	};
 }
 const TYPE_NORMALIZATION = /* @__PURE__ */ new Map([["ctrTitle", "title"], ["subTitle", "body"]]);

package/dist/typed/pptx/read.cjs

@@ -104,7 +104,8 @@ function readLineSpacingMultiplier(pPr) {
 }
 function readParagraph(pEl, placeholderType, context, slideRels) {
 	const pPr = require_typed_util.childrenWithTag(pEl, "a:pPr")[0];
-	const masterDefaults = require_typed_pptx_inherit.resolveDefaultRunProperties(placeholderType, pPr === void 0 ? 0 : Number(require_typed_util.attr(pPr, "lvl") ?? "0"), context);
+	const level = pPr === void 0 ? 0 : Number(require_typed_util.attr(pPr, "lvl") ?? "0");
+	const masterDefaults = require_typed_pptx_inherit.resolveDefaultRunProperties(placeholderType, level, context);
 	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 = [];
@@ -200,7 +201,8 @@ function readPicShape(pic, context, slideRels, pkg, parentTransform) {
 	const mediaPart = rel === void 0 ? void 0 : pkg.parts[rel.target];
 	const blocks = [];
 	if (mediaPart?.kind === "binary") {
-		const format = require_image_sniff.sniffImageFormat(require_util_base64.base64ToBytes(mediaPart.base64));
+		const bytes = require_util_base64.base64ToBytes(mediaPart.base64);
+		const format = require_image_sniff.sniffImageFormat(bytes);
 		if (format !== void 0) {
 			const image = {
 				kind: "image",
@@ -225,7 +227,8 @@ function readTableCell(tc, context, slideRels) {
 	const vMerge = require_typed_util.attr(tc, "vMerge");
 	if (hMerge === "1" || vMerge === "1") return { blocks: [] };
 	const tcPr = require_typed_util.childrenWithTag(tc, "a:tcPr")[0];
-	const background = require_typed_shared_drawingml.readSolidFillColor(tcPr === void 0 ? void 0 : require_typed_util.childrenWithTag(tcPr, "a:solidFill")[0], context.colorMap, context.theme);
+	const solidFill = tcPr === void 0 ? void 0 : require_typed_util.childrenWithTag(tcPr, "a:solidFill")[0];
+	const background = require_typed_shared_drawingml.readSolidFillColor(solidFill, context.colorMap, context.theme);
 	const txBody = require_typed_util.childrenWithTag(tc, "a:txBody")[0];
 	const gridSpan = require_typed_util.attr(tc, "gridSpan");
 	const rowSpan = require_typed_util.attr(tc, "rowSpan");
@@ -289,7 +292,9 @@ function walkShapeTreeChildren(children, parentTransform, context, slideRels, pk
 			if (shape !== void 0) out.push(shape);
 		} else if (node.tag === "p:grpSp") {
 			const grpSpPr = require_typed_util.childrenWithTag(node, "p:grpSpPr")[0];
-			const composed = require_typed_shared_drawingml.composeGroupTransform(require_typed_shared_drawingml.readGroupXfrm(grpSpPr === void 0 ? void 0 : require_typed_util.childrenWithTag(grpSpPr, "a:xfrm")[0]), parentTransform);
+			const xfrmEl = grpSpPr === void 0 ? void 0 : require_typed_util.childrenWithTag(grpSpPr, "a:xfrm")[0];
+			const ownGroupTransform = require_typed_shared_drawingml.readGroupXfrm(xfrmEl);
+			const composed = require_typed_shared_drawingml.composeGroupTransform(ownGroupTransform, parentTransform);
 			walkShapeTreeChildren(node.children, composed, context, slideRels, pkg, out);
 		}
 	}

package/dist/typed/pptx/read.js

@@ -103,7 +103,8 @@ function readLineSpacingMultiplier(pPr) {
 }
 function readParagraph(pEl, placeholderType, context, slideRels) {
 	const pPr = childrenWithTag(pEl, "a:pPr")[0];
-	const masterDefaults = resolveDefaultRunProperties(placeholderType, pPr === void 0 ? 0 : Number(attr(pPr, "lvl") ?? "0"), context);
+	const level = pPr === void 0 ? 0 : Number(attr(pPr, "lvl") ?? "0");
+	const masterDefaults = resolveDefaultRunProperties(placeholderType, level, context);
 	const pPrDefRPr = pPr === void 0 ? void 0 : childrenWithTag(pPr, "a:defRPr")[0];
 	const paragraphDefaults = pPrDefRPr === void 0 ? masterDefaults : mergeRunProperties(masterDefaults, readRunPropertiesFromElement(pPrDefRPr, context));
 	const runs = [];
@@ -199,7 +200,8 @@ function readPicShape(pic, context, slideRels, pkg, parentTransform) {
 	const mediaPart = rel === void 0 ? void 0 : pkg.parts[rel.target];
 	const blocks = [];
 	if (mediaPart?.kind === "binary") {
-		const format = sniffImageFormat(base64ToBytes(mediaPart.base64));
+		const bytes = base64ToBytes(mediaPart.base64);
+		const format = sniffImageFormat(bytes);
 		if (format !== void 0) {
 			const image = {
 				kind: "image",
@@ -224,7 +226,8 @@ function readTableCell(tc, context, slideRels) {
 	const vMerge = attr(tc, "vMerge");
 	if (hMerge === "1" || vMerge === "1") return { blocks: [] };
 	const tcPr = childrenWithTag(tc, "a:tcPr")[0];
-	const background = readSolidFillColor(tcPr === void 0 ? void 0 : childrenWithTag(tcPr, "a:solidFill")[0], context.colorMap, context.theme);
+	const solidFill = tcPr === void 0 ? void 0 : childrenWithTag(tcPr, "a:solidFill")[0];
+	const background = readSolidFillColor(solidFill, context.colorMap, context.theme);
 	const txBody = childrenWithTag(tc, "a:txBody")[0];
 	const gridSpan = attr(tc, "gridSpan");
 	const rowSpan = attr(tc, "rowSpan");
@@ -288,7 +291,9 @@ function walkShapeTreeChildren(children, parentTransform, context, slideRels, pk
 			if (shape !== void 0) out.push(shape);
 		} else if (node.tag === "p:grpSp") {
 			const grpSpPr = childrenWithTag(node, "p:grpSpPr")[0];
-			const composed = composeGroupTransform(readGroupXfrm(grpSpPr === void 0 ? void 0 : childrenWithTag(grpSpPr, "a:xfrm")[0]), parentTransform);
+			const xfrmEl = grpSpPr === void 0 ? void 0 : childrenWithTag(grpSpPr, "a:xfrm")[0];
+			const ownGroupTransform = readGroupXfrm(xfrmEl);
+			const composed = composeGroupTransform(ownGroupTransform, parentTransform);
 			walkShapeTreeChildren(node.children, composed, context, slideRels, pkg, out);
 		}
 	}

package/dist/typed/xlsx/build.cjs

@@ -162,11 +162,12 @@ function buildDefinedNameElements(sheets) {
 	return elements;
 }
 function buildWorkbookPart(sheets) {
-	const children = [require_xml_fragment.el("sheets", {}, sheets.map((sheet, index) => require_xml_fragment.el("sheet", {
+	const sheetElements = sheets.map((sheet, index) => require_xml_fragment.el("sheet", {
 		name: require_xml_entities.encodeXmlText(sheet.name),
 		sheetId: String(index + 1),
 		"r:id": worksheetRelId(index)
-	})))];
+	}));
+	const children = [require_xml_fragment.el("sheets", {}, sheetElements)];
 	const definedNameElements = buildDefinedNameElements(sheets);
 	if (definedNameElements.length > 0) children.push(require_xml_fragment.el("definedNames", {}, definedNameElements));
 	return xmlPart(require_xml_fragment.el("workbook", {
@@ -270,7 +271,7 @@ function computeDimension(sheet) {
 }
 function buildColsElement(columns) {
 	if (columns.length === 0) return;
-	return require_xml_fragment.el("cols", {}, columns.map((column) => {
+	const colElements = columns.map((column) => {
 		const attrs = {
 			min: String(column.index + 1),
 			max: String(column.index + 1)
@@ -281,7 +282,8 @@ function buildColsElement(columns) {
 		}
 		if (column.hidden === true) attrs.hidden = "true";
 		return require_xml_fragment.el("col", attrs);
-	}));
+	});
+	return require_xml_fragment.el("cols", {}, colElements);
 }
 function renderCellValue(value, isFormulaResult, sharedStrings) {
 	switch (value.kind) {
@@ -351,7 +353,7 @@ function buildSheetDataElement(sheet, sharedStrings, cellFormats) {
 	}
 	const rowInfoByIndex = /* @__PURE__ */ new Map();
 	for (const row of sheet.rows) rowInfoByIndex.set(row.index, row);
-	return require_xml_fragment.el("sheetData", {}, Array.from(/* @__PURE__ */ new Set([...cellsByRow.keys(), ...rowInfoByIndex.keys()])).sort((a, b) => a - b).map((rowIndex) => {
+	const rowElements = Array.from(/* @__PURE__ */ new Set([...cellsByRow.keys(), ...rowInfoByIndex.keys()])).sort((a, b) => a - b).map((rowIndex) => {
 		const cells = (cellsByRow.get(rowIndex) ?? []).slice().sort((a, b) => a.column - b.column);
 		const rowInfo = rowInfoByIndex.get(rowIndex);
 		const attrs = { r: String(rowIndex + 1) };
@@ -363,7 +365,8 @@ function buildSheetDataElement(sheet, sharedStrings, cellFormats) {
 			if (rowInfo.hidden === true) attrs.hidden = "true";
 		}
 		return require_xml_fragment.el("row", attrs, cells.map((cell) => buildCellElement(cell, sharedStrings, cellFormats)));
-	}));
+	});
+	return require_xml_fragment.el("sheetData", {}, rowElements);
 }
 function buildMergeCellsElement(cells) {
 	const merges = cells.filter((cell) => (cell.colSpan ?? 1) > 1 || (cell.rowSpan ?? 1) > 1);

package/dist/typed/xlsx/build.js

@@ -161,11 +161,12 @@ function buildDefinedNameElements(sheets) {
 	return elements;
 }
 function buildWorkbookPart(sheets) {
-	const children = [el("sheets", {}, sheets.map((sheet, index) => el("sheet", {
+	const sheetElements = sheets.map((sheet, index) => el("sheet", {
 		name: encodeXmlText(sheet.name),
 		sheetId: String(index + 1),
 		"r:id": worksheetRelId(index)
-	})))];
+	}));
+	const children = [el("sheets", {}, sheetElements)];
 	const definedNameElements = buildDefinedNameElements(sheets);
 	if (definedNameElements.length > 0) children.push(el("definedNames", {}, definedNameElements));
 	return xmlPart(el("workbook", {
@@ -269,7 +270,7 @@ function computeDimension(sheet) {
 }
 function buildColsElement(columns) {
 	if (columns.length === 0) return;
-	return el("cols", {}, columns.map((column) => {
+	const colElements = columns.map((column) => {
 		const attrs = {
 			min: String(column.index + 1),
 			max: String(column.index + 1)
@@ -280,7 +281,8 @@ function buildColsElement(columns) {
 		}
 		if (column.hidden === true) attrs.hidden = "true";
 		return el("col", attrs);
-	}));
+	});
+	return el("cols", {}, colElements);
 }
 function renderCellValue(value, isFormulaResult, sharedStrings) {
 	switch (value.kind) {
@@ -350,7 +352,7 @@ function buildSheetDataElement(sheet, sharedStrings, cellFormats) {
 	}
 	const rowInfoByIndex = /* @__PURE__ */ new Map();
 	for (const row of sheet.rows) rowInfoByIndex.set(row.index, row);
-	return el("sheetData", {}, Array.from(/* @__PURE__ */ new Set([...cellsByRow.keys(), ...rowInfoByIndex.keys()])).sort((a, b) => a - b).map((rowIndex) => {
+	const rowElements = Array.from(/* @__PURE__ */ new Set([...cellsByRow.keys(), ...rowInfoByIndex.keys()])).sort((a, b) => a - b).map((rowIndex) => {
 		const cells = (cellsByRow.get(rowIndex) ?? []).slice().sort((a, b) => a.column - b.column);
 		const rowInfo = rowInfoByIndex.get(rowIndex);
 		const attrs = { r: String(rowIndex + 1) };
@@ -362,7 +364,8 @@ function buildSheetDataElement(sheet, sharedStrings, cellFormats) {
 			if (rowInfo.hidden === true) attrs.hidden = "true";
 		}
 		return el("row", attrs, cells.map((cell) => buildCellElement(cell, sharedStrings, cellFormats)));
-	}));
+	});
+	return el("sheetData", {}, rowElements);
 }
 function buildMergeCellsElement(cells) {
 	const merges = cells.filter((cell) => (cell.colSpan ?? 1) > 1 || (cell.rowSpan ?? 1) > 1);

package/dist/typed/xlsx/print-settings.cjs

@@ -6,10 +6,10 @@ const require_typed_xlsx_util = require("./util.cjs");
 let document_schema_js = require("document-schema.js");
 //#region src/typed/xlsx/print-settings.ts
 const DEFAULT_MARGINS = {
-	topPt: .75 * 72,
-	rightPt: .7 * 72,
-	bottomPt: .75 * 72,
-	leftPt: .7 * 72
+	topPt: 54,
+	rightPt: 50.4,
+	bottomPt: 54,
+	leftPt: 50.4
 };
 const DEFAULT_HEADER_FOOTER_MARGIN_PT = .3 * 72;
 const DEFAULT_FIT_TO_PAGES = 1;

package/dist/typed/xlsx/print-settings.js

@@ -5,10 +5,10 @@ import { paperSizeCodeToPageSize, parseUniversalMeasureToPt, readXmlBool } from
 import { PAGE_SIZE_LETTER } from "document-schema.js";
 //#region src/typed/xlsx/print-settings.ts
 const DEFAULT_MARGINS = {
-	topPt: .75 * 72,
-	rightPt: .7 * 72,
-	bottomPt: .75 * 72,
-	leftPt: .7 * 72
+	topPt: 54,
+	rightPt: 50.4,
+	bottomPt: 54,
+	leftPt: 50.4
 };
 const DEFAULT_HEADER_FOOTER_MARGIN_PT = .3 * 72;
 const DEFAULT_FIT_TO_PAGES = 1;

package/package.json

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