ooxml.js 2.5.2 → 2.6.1

package/dist/typed/docx/read.d.cts

@@ -45,6 +45,14 @@ declare const DocxDocumentSchema: z.ZodObject<{
   }, z.core.$strip>>;
   headers: z.ZodArray<z.ZodString>;
   footers: z.ZodArray<z.ZodString>;
+  numbering: z.ZodRecord<z.ZodString, z.ZodObject<{
+    levels: z.ZodRecord<z.ZodString, z.ZodObject<{
+      format: z.ZodString;
+      text: z.ZodString;
+      startAt: z.ZodNumber;
+      restart: z.ZodOptional<z.ZodNumber>;
+    }, z.core.$strip>>;
+  }, z.core.$strip>>;
 }, z.core.$strip>;
 type DocxDocument = z.infer<typeof DocxDocumentSchema>;
 declare function readDocx(pkg: Package): DocxDocument;

package/dist/typed/docx/read.d.ts

@@ -45,6 +45,14 @@ declare const DocxDocumentSchema: z.ZodObject<{
   }, z.core.$strip>>;
   headers: z.ZodArray<z.ZodString>;
   footers: z.ZodArray<z.ZodString>;
+  numbering: z.ZodRecord<z.ZodString, z.ZodObject<{
+    levels: z.ZodRecord<z.ZodString, z.ZodObject<{
+      format: z.ZodString;
+      text: z.ZodString;
+      startAt: z.ZodNumber;
+      restart: z.ZodOptional<z.ZodNumber>;
+    }, z.core.$strip>>;
+  }, z.core.$strip>>;
 }, z.core.$strip>;
 type DocxDocument = z.infer<typeof DocxDocumentSchema>;
 declare function readDocx(pkg: Package): DocxDocument;

package/dist/typed/docx/read.js

@@ -1,11 +1,14 @@
+import { base64ToBytes } from "../../util/base64.js";
 import { attr, childrenWithTag, elementsWithTag, resolveRelationships, rootElement, textContent } from "../util.js";
 import { DocumentMetadataSchema, readCoreProperties } from "../shared/metadata.js";
-import { twipsToPt } from "../shared/units.js";
+import { sniffImageFormat } from "../../image/sniff.js";
+import { eighthPointsToPt, emuToPt, twipsToPt } from "../shared/units.js";
 import { EMPTY_THEME, readTheme } from "../shared/drawingml.js";
 import { assignSourcePaths } from "../shared/source-path.js";
 import { resolveParagraphProperties, resolveRunProperties } from "./styles.js";
+import { NumberingDefinitionSchema, readNumberingDefinitions } from "./numbering.js";
 import { z } from "zod";
-import { ContentSectionSchema, PAGE_SIZE_LETTER, rgbHexToColor } from "document-schema.js";
+import { COLOR_BLACK, ContentSectionSchema, PAGE_SIZE_LETTER, rgbHexToColor } from "document-schema.js";
 //#region src/typed/docx/read.ts
 const CommentSchema = z.object({
 	author: z.string().optional(),
@@ -21,7 +24,8 @@ const DocxDocumentSchema = z.object({
 	comments: z.array(CommentSchema),
 	footnotes: z.array(FootnoteSchema),
 	headers: z.array(z.string()),
-	footers: z.array(z.string())
+	footers: z.array(z.string()),
+	numbering: z.record(z.string(), NumberingDefinitionSchema)
 });
 const DOCUMENT_PART_PATH = "word/document.xml";
 const STYLES_PART_PATH = "word/styles.xml";
@@ -88,6 +92,53 @@ function readRunText(run) {
 	}
 	return text;
 }
+function readDrawingImage(drawing, rels, pkg) {
+	const container = childrenWithTag(drawing, "wp:inline")[0] ?? childrenWithTag(drawing, "wp:anchor")[0];
+	if (container === void 0) return;
+	const extent = childrenWithTag(container, "wp:extent")[0];
+	const cx = extent === void 0 ? void 0 : attr(extent, "cx");
+	const cy = extent === void 0 ? void 0 : attr(extent, "cy");
+	if (cx === void 0 || cy === void 0) return;
+	const docPr = childrenWithTag(container, "wp:docPr")[0];
+	const altText = docPr === void 0 ? void 0 : attr(docPr, "descr") ?? attr(docPr, "title");
+	const blip = elementsWithTag(container.children, "a:blip")[0];
+	const rId = blip === void 0 ? void 0 : 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];
+	if (mediaPart?.kind !== "binary") return;
+	const format = sniffImageFormat(base64ToBytes(mediaPart.base64));
+	if (format === void 0) return;
+	const image = {
+		kind: "image",
+		format,
+		base64: mediaPart.base64,
+		widthPt: emuToPt(Number(cx)),
+		heightPt: emuToPt(Number(cy))
+	};
+	if (altText !== void 0) image.altText = altText;
+	return image;
+}
+function collectDrawings(nodes, out) {
+	for (const node of nodes) {
+		if (node.type !== "element") continue;
+		if (node.tag === "w:del") continue;
+		if (node.tag === "w:drawing") {
+			out.push(node);
+			continue;
+		}
+		collectDrawings(node.children, out);
+	}
+}
+function readParagraphImages(paragraph, rels, pkg) {
+	const drawings = [];
+	collectDrawings(paragraph.children, drawings);
+	const images = [];
+	for (const drawing of drawings) {
+		const image = readDrawingImage(drawing, rels, pkg);
+		if (image !== void 0) images.push(image);
+	}
+	return images;
+}
 function readRun(run, paragraph, context) {
 	const props = resolveRunProperties(run, paragraph, context);
 	return {
@@ -155,7 +206,51 @@ function readCellShading(tcPr) {
 	const fill = shd === void 0 ? void 0 : attr(shd, "w:fill");
 	return fill === void 0 || fill === "auto" || fill === "none" ? void 0 : rgbHexToColor(fill);
 }
-function readRawCell(tc, context, rels) {
+const BORDER_STYLE_MAP = /* @__PURE__ */ new Map([
+	["single", "solid"],
+	["thick", "solid"],
+	["triple", "solid"],
+	["outset", "solid"],
+	["inset", "solid"],
+	["threeDEmboss", "solid"],
+	["threeDEngrave", "solid"],
+	["dashed", "dashed"],
+	["dashSmallGap", "dashed"],
+	["dashDotStroked", "dashed"],
+	["dotDash", "dashed"],
+	["dotted", "dotted"],
+	["dotDotDash", "dotted"],
+	["double", "double"],
+	["doubleWave", "double"]
+]);
+const DEFAULT_BORDER_WIDTH_EIGHTH_POINTS = 4;
+function readCellBorderEdge(tcBorders, tag) {
+	const edge = tcBorders === void 0 ? void 0 : childrenWithTag(tcBorders, tag)[0];
+	const val = edge === void 0 ? void 0 : attr(edge, "w:val");
+	if (edge === void 0 || val === void 0 || val === "nil" || val === "none") return;
+	const sz = attr(edge, "w:sz");
+	const colorVal = attr(edge, "w:color");
+	return {
+		color: colorVal === void 0 || colorVal === "auto" ? COLOR_BLACK : rgbHexToColor(colorVal),
+		widthPt: eighthPointsToPt(sz === void 0 ? DEFAULT_BORDER_WIDTH_EIGHTH_POINTS : Number(sz)),
+		style: BORDER_STYLE_MAP.get(val) ?? "solid"
+	};
+}
+function readCellBorders(tcPr) {
+	const tcBorders = tcPr === void 0 ? void 0 : childrenWithTag(tcPr, "w:tcBorders")[0];
+	if (tcBorders === void 0) return;
+	const borders = {};
+	const left = readCellBorderEdge(tcBorders, "w:left") ?? readCellBorderEdge(tcBorders, "w:start");
+	const right = readCellBorderEdge(tcBorders, "w:right") ?? readCellBorderEdge(tcBorders, "w:end");
+	const top = readCellBorderEdge(tcBorders, "w:top");
+	const bottom = readCellBorderEdge(tcBorders, "w:bottom");
+	if (left !== void 0) borders.left = left;
+	if (right !== void 0) borders.right = right;
+	if (top !== void 0) borders.top = top;
+	if (bottom !== void 0) borders.bottom = bottom;
+	return Object.keys(borders).length === 0 ? void 0 : borders;
+}
+function readRawCell(tc, context, rels, pkg) {
 	const tcPr = childrenWithTag(tc, "w:tcPr")[0];
 	const gridSpanEl = tcPr === void 0 ? void 0 : childrenWithTag(tcPr, "w:gridSpan")[0];
 	const gridSpanVal = gridSpanEl === void 0 ? void 0 : attr(gridSpanEl, "w:val");
@@ -165,13 +260,14 @@ function readRawCell(tc, context, rels) {
 		gridSpan: gridSpanVal === void 0 ? 1 : Number(gridSpanVal),
 		isVMergeContinuation: vMergeVal === "continue",
 		background: readCellShading(tcPr),
-		blocks: readBodyBlocks(tc.children, context, rels)
+		borders: readCellBorders(tcPr),
+		blocks: readBodyBlocks(tc.children, context, rels, pkg)
 	};
 }
-function readTable(tbl, context, rels) {
+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)));
+	const rawRows = childrenWithTag(tbl, "w:tr").map((tr) => childrenWithTag(tr, "w:tc").map((tc) => readRawCell(tc, context, rels, pkg)));
 	const rowColumnIndices = rawRows.map((row) => {
 		const indices = [];
 		let col = 0;
@@ -197,31 +293,33 @@ function readTable(tbl, context, rels) {
 				blocks: cell.blocks,
 				colSpan: cell.gridSpan > 1 ? cell.gridSpan : void 0,
 				rowSpan: rowSpan > 1 ? rowSpan : void 0,
-				background: cell.background
+				background: cell.background,
+				borders: cell.borders
 			};
 		}) }))
 	};
 }
-function readBodyBlocks(nodes, context, rels) {
+function readBodyBlocks(nodes, context, rels, pkg) {
 	const blocks = [];
 	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));
-		} else if (node.tag === "w:tbl") blocks.push(readTable(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") {
 			const sdtContent = childrenWithTag(node, "w:sdtContent")[0];
-			if (sdtContent !== void 0) blocks.push(...readBodyBlocks(sdtContent.children, context, rels));
-		} else if (node.tag === "w:ins") blocks.push(...readBodyBlocks(node.children, context, rels));
+			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") {
 			const target = childrenWithTag(node, "mc:Fallback")[0] ?? childrenWithTag(node, "mc:Choice")[0];
-			if (target !== void 0) blocks.push(...readBodyBlocks(target.children, context, rels));
+			if (target !== void 0) blocks.push(...readBodyBlocks(target.children, context, rels, pkg));
 		}
 	}
 	return blocks;
 }
-function readSections(body, context, rels) {
+function readSections(body, context, rels, pkg) {
 	const sections = [];
 	let currentBlocks = [];
 	for (const node of body.children) {
@@ -240,6 +338,7 @@ function readSections(body, context, rels) {
 			const sectPr = pPr === void 0 ? void 0 : 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),
@@ -250,7 +349,7 @@ function readSections(body, context, rels) {
 			}
 			continue;
 		}
-		currentBlocks.push(...readBodyBlocks([node], context, rels));
+		currentBlocks.push(...readBodyBlocks([node], context, rels, pkg));
 	}
 	if (currentBlocks.length > 0 || sections.length === 0) sections.push({
 		pageSize: PAGE_SIZE_LETTER,
@@ -317,11 +416,12 @@ function readDocx(pkg) {
 	};
 	return {
 		metadata: readCoreProperties(pkg),
-		sections: readSections(body, context, docRels),
+		sections: readSections(body, context, docRels, pkg),
 		comments: readComments(pkg),
 		footnotes: readFootnotes(pkg),
 		headers: readHeaderFooterText(pkg, "word/header"),
-		footers: readHeaderFooterText(pkg, "word/footer")
+		footers: readHeaderFooterText(pkg, "word/footer"),
+		numbering: readNumberingDefinitions(pkg)
 	};
 }
 //#endregion

package/dist/typed/docx/styles.cjs

@@ -34,8 +34,32 @@ function readUnderline(u) {
 	const val = require_typed_util.attr(u, "w:val");
 	return val !== void 0 && val !== "none";
 }
-function readRunColor(colorEl) {
+const THEME_COLOR_SLOT = /* @__PURE__ */ new Map([
+	["dark1", "dk1"],
+	["light1", "lt1"],
+	["dark2", "dk2"],
+	["light2", "lt2"],
+	["accent1", "accent1"],
+	["accent2", "accent2"],
+	["accent3", "accent3"],
+	["accent4", "accent4"],
+	["accent5", "accent5"],
+	["accent6", "accent6"],
+	["hyperlink", "hlink"],
+	["followedHyperlink", "folHlink"],
+	["background1", "lt1"],
+	["text1", "dk1"],
+	["background2", "lt2"],
+	["text2", "dk2"]
+]);
+function readRunColor(colorEl, theme) {
 	if (colorEl === void 0) return;
+	const themeColor = require_typed_util.attr(colorEl, "w:themeColor");
+	if (themeColor !== void 0) {
+		const slot = THEME_COLOR_SLOT.get(themeColor);
+		const resolved = slot === void 0 ? void 0 : theme.colorScheme.get(slot);
+		if (resolved !== void 0) return resolved;
+	}
 	const val = require_typed_util.attr(colorEl, "w:val");
 	return val === void 0 || val === "auto" ? void 0 : (0, document_schema_js.rgbHexToColor)(val);
 }
@@ -58,7 +82,7 @@ function readRunPropertiesLayer(rPr, theme) {
 		strike: readToggle(require_typed_util.childrenWithTag(rPr, "w:strike")[0]),
 		fontFamily: readRunFontFamily(require_typed_util.childrenWithTag(rPr, "w:rFonts")[0], theme),
 		sizePt: szVal === void 0 ? void 0 : require_typed_shared_units.halfPointsToPt(Number(szVal)),
-		color: readRunColor(require_typed_util.childrenWithTag(rPr, "w:color")[0])
+		color: readRunColor(require_typed_util.childrenWithTag(rPr, "w:color")[0], theme)
 	};
 }
 function readAlignment(jc) {

package/dist/typed/docx/styles.js

@@ -33,8 +33,32 @@ function readUnderline(u) {
 	const val = attr(u, "w:val");
 	return val !== void 0 && val !== "none";
 }
-function readRunColor(colorEl) {
+const THEME_COLOR_SLOT = /* @__PURE__ */ new Map([
+	["dark1", "dk1"],
+	["light1", "lt1"],
+	["dark2", "dk2"],
+	["light2", "lt2"],
+	["accent1", "accent1"],
+	["accent2", "accent2"],
+	["accent3", "accent3"],
+	["accent4", "accent4"],
+	["accent5", "accent5"],
+	["accent6", "accent6"],
+	["hyperlink", "hlink"],
+	["followedHyperlink", "folHlink"],
+	["background1", "lt1"],
+	["text1", "dk1"],
+	["background2", "lt2"],
+	["text2", "dk2"]
+]);
+function readRunColor(colorEl, theme) {
 	if (colorEl === void 0) return;
+	const themeColor = attr(colorEl, "w:themeColor");
+	if (themeColor !== void 0) {
+		const slot = THEME_COLOR_SLOT.get(themeColor);
+		const resolved = slot === void 0 ? void 0 : theme.colorScheme.get(slot);
+		if (resolved !== void 0) return resolved;
+	}
 	const val = attr(colorEl, "w:val");
 	return val === void 0 || val === "auto" ? void 0 : rgbHexToColor(val);
 }
@@ -57,7 +81,7 @@ function readRunPropertiesLayer(rPr, theme) {
 		strike: readToggle(childrenWithTag(rPr, "w:strike")[0]),
 		fontFamily: readRunFontFamily(childrenWithTag(rPr, "w:rFonts")[0], theme),
 		sizePt: szVal === void 0 ? void 0 : halfPointsToPt(Number(szVal)),
-		color: readRunColor(childrenWithTag(rPr, "w:color")[0])
+		color: readRunColor(childrenWithTag(rPr, "w:color")[0], theme)
 	};
 }
 function readAlignment(jc) {

package/dist/typed/pptx/read.cjs

@@ -169,9 +169,10 @@ function resolveShapeFrame(shape, context, parentTransform) {
 		widthPt: xfrm.widthPt,
 		heightPt: xfrm.heightPt
 	};
+	const rotationDeg = require_typed_shared_drawingml.composeShapeRotationDeg(parentTransform, xfrm.rotationDeg);
 	return {
 		frame: parentTransform === void 0 ? localFrame : require_typed_shared_drawingml.applyGroupTransform(parentTransform, localFrame),
-		rotationDeg: xfrm.rotationDeg === 0 ? void 0 : xfrm.rotationDeg
+		rotationDeg: rotationDeg === 0 ? void 0 : rotationDeg
 	};
 }
 function readSpShape(sp, context, slideRels, parentTransform) {
@@ -260,7 +261,8 @@ function readGraphicFrameShape(gf, context, slideRels, parentTransform) {
 		heightPt: xfrm.heightPt
 	};
 	const frame = parentTransform === void 0 ? localFrame : require_typed_shared_drawingml.applyGroupTransform(parentTransform, localFrame);
-	const rotationDeg = xfrm.rotationDeg === 0 ? void 0 : xfrm.rotationDeg;
+	const composedRotationDeg = require_typed_shared_drawingml.composeShapeRotationDeg(parentTransform, xfrm.rotationDeg);
+	const rotationDeg = composedRotationDeg === 0 ? void 0 : composedRotationDeg;
 	const graphic = require_typed_util.childrenWithTag(gf, "a:graphic")[0];
 	const graphicData = graphic === void 0 ? void 0 : require_typed_util.childrenWithTag(graphic, "a:graphicData")[0];
 	const tbl = (graphicData === void 0 ? void 0 : require_typed_util.attr(graphicData, "uri")) === TABLE_GRAPHIC_URI && graphicData !== void 0 ? require_typed_util.childrenWithTag(graphicData, "a:tbl")[0] : void 0;
@@ -287,28 +289,11 @@ 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 = composeGroupTransform(require_typed_shared_drawingml.readGroupXfrm(grpSpPr === void 0 ? void 0 : require_typed_util.childrenWithTag(grpSpPr, "a:xfrm")[0]), parentTransform);
+			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);
 			walkShapeTreeChildren(node.children, composed, context, slideRels, pkg, out);
 		}
 	}
 }
-function composeGroupTransform(own, parent) {
-	if (own === void 0) return;
-	if (parent === void 0) return own;
-	const absolute = require_typed_shared_drawingml.applyGroupTransform(parent, {
-		xPt: own.offXPt,
-		yPt: own.offYPt,
-		widthPt: own.extWidthPt,
-		heightPt: own.extHeightPt
-	});
-	return {
-		...own,
-		offXPt: absolute.xPt,
-		offYPt: absolute.yPt,
-		extWidthPt: absolute.widthPt,
-		extHeightPt: absolute.heightPt
-	};
-}
 const NOTES_SLIDE_REL_SUFFIX = "/notesSlide";
 function readNotes(pkg, slidePath) {
 	let notesPath;

package/dist/typed/pptx/read.js

@@ -3,7 +3,7 @@ import { attr, childrenWithTag, elementsWithTag, resolveRelationships, rootEleme
 import { DocumentMetadataSchema, readCoreProperties } from "../shared/metadata.js";
 import { sniffImageFormat } from "../../image/sniff.js";
 import { drawingMlFontSizeToPt, emuToPt } from "../shared/units.js";
-import { applyGroupTransform, readGroupXfrm, readSolidFillColor, readXfrm } from "../shared/drawingml.js";
+import { applyGroupTransform, composeGroupTransform, composeShapeRotationDeg, readGroupXfrm, readSolidFillColor, readXfrm } from "../shared/drawingml.js";
 import { assignSourcePaths } from "../shared/source-path.js";
 import { readPlaceholderKey, readRunPropertiesFromElement, resolveDefaultRunProperties, resolvePlaceholderXfrm, resolveSlideInheritance } from "./inherit.js";
 import { z } from "zod";
@@ -168,9 +168,10 @@ function resolveShapeFrame(shape, context, parentTransform) {
 		widthPt: xfrm.widthPt,
 		heightPt: xfrm.heightPt
 	};
+	const rotationDeg = composeShapeRotationDeg(parentTransform, xfrm.rotationDeg);
 	return {
 		frame: parentTransform === void 0 ? localFrame : applyGroupTransform(parentTransform, localFrame),
-		rotationDeg: xfrm.rotationDeg === 0 ? void 0 : xfrm.rotationDeg
+		rotationDeg: rotationDeg === 0 ? void 0 : rotationDeg
 	};
 }
 function readSpShape(sp, context, slideRels, parentTransform) {
@@ -259,7 +260,8 @@ function readGraphicFrameShape(gf, context, slideRels, parentTransform) {
 		heightPt: xfrm.heightPt
 	};
 	const frame = parentTransform === void 0 ? localFrame : applyGroupTransform(parentTransform, localFrame);
-	const rotationDeg = xfrm.rotationDeg === 0 ? void 0 : xfrm.rotationDeg;
+	const composedRotationDeg = composeShapeRotationDeg(parentTransform, xfrm.rotationDeg);
+	const rotationDeg = composedRotationDeg === 0 ? void 0 : composedRotationDeg;
 	const graphic = childrenWithTag(gf, "a:graphic")[0];
 	const graphicData = graphic === void 0 ? void 0 : childrenWithTag(graphic, "a:graphicData")[0];
 	const tbl = (graphicData === void 0 ? void 0 : attr(graphicData, "uri")) === TABLE_GRAPHIC_URI && graphicData !== void 0 ? childrenWithTag(graphicData, "a:tbl")[0] : void 0;
@@ -291,23 +293,6 @@ function walkShapeTreeChildren(children, parentTransform, context, slideRels, pk
 		}
 	}
 }
-function composeGroupTransform(own, parent) {
-	if (own === void 0) return;
-	if (parent === void 0) return own;
-	const absolute = applyGroupTransform(parent, {
-		xPt: own.offXPt,
-		yPt: own.offYPt,
-		widthPt: own.extWidthPt,
-		heightPt: own.extHeightPt
-	});
-	return {
-		...own,
-		offXPt: absolute.xPt,
-		offYPt: absolute.yPt,
-		extWidthPt: absolute.widthPt,
-		extHeightPt: absolute.heightPt
-	};
-}
 const NOTES_SLIDE_REL_SUFFIX = "/notesSlide";
 function readNotes(pkg, slidePath) {
 	let notesPath;

package/dist/typed/shared/drawingml.cjs

@@ -164,22 +164,129 @@ function readGroupXfrm(xfrm) {
 		childOffXPt: require_typed_shared_units.emuToPt(Number(cx)),
 		childOffYPt: require_typed_shared_units.emuToPt(Number(cy)),
 		childExtWidthPt: require_typed_shared_units.emuToPt(Number(ccx)),
-		childExtHeightPt: require_typed_shared_units.emuToPt(Number(ccy))
+		childExtHeightPt: require_typed_shared_units.emuToPt(Number(ccy)),
+		rotationDeg: base.rotationDeg,
+		flipH: base.flipH,
+		flipV: base.flipV
+	};
+}
+function normalizeDeg(deg) {
+	const mod = deg % 360;
+	return mod < 0 ? mod + 360 : mod;
+}
+function canonicalizeGroupRotation(rotationDeg, flipH, flipV) {
+	if (flipH && flipV) return {
+		angleDeg: rotationDeg + 180,
+		mirrored: false
+	};
+	if (flipV) return {
+		angleDeg: rotationDeg + 180,
+		mirrored: true
+	};
+	if (flipH) return {
+		angleDeg: rotationDeg,
+		mirrored: true
+	};
+	return {
+		angleDeg: rotationDeg,
+		mirrored: false
+	};
+}
+function composeRotation(outer, inner) {
+	if (!outer.mirrored) return {
+		angleDeg: normalizeDeg(outer.angleDeg + inner.angleDeg),
+		mirrored: inner.mirrored
+	};
+	return {
+		angleDeg: normalizeDeg(outer.angleDeg - inner.angleDeg),
+		mirrored: !inner.mirrored
+	};
+}
+function composeGroupTransform(own, parent) {
+	if (own === void 0) return;
+	const ownRotation = canonicalizeGroupRotation(own.rotationDeg, own.flipH, own.flipV);
+	if (parent === void 0) return {
+		offXPt: own.offXPt,
+		offYPt: own.offYPt,
+		extWidthPt: own.extWidthPt,
+		extHeightPt: own.extHeightPt,
+		childOffXPt: own.childOffXPt,
+		childOffYPt: own.childOffYPt,
+		childExtWidthPt: own.childExtWidthPt,
+		childExtHeightPt: own.childExtHeightPt,
+		compositeRotationDeg: normalizeDeg(ownRotation.angleDeg),
+		compositeMirrored: ownRotation.mirrored
+	};
+	const mapped = applyGroupTransform(parent, {
+		xPt: own.offXPt,
+		yPt: own.offYPt,
+		widthPt: own.extWidthPt,
+		heightPt: own.extHeightPt
+	});
+	const composite = composeRotation({
+		angleDeg: parent.compositeRotationDeg,
+		mirrored: parent.compositeMirrored
+	}, ownRotation);
+	return {
+		offXPt: mapped.xPt,
+		offYPt: mapped.yPt,
+		extWidthPt: mapped.widthPt,
+		extHeightPt: mapped.heightPt,
+		childOffXPt: own.childOffXPt,
+		childOffYPt: own.childOffYPt,
+		childExtWidthPt: own.childExtWidthPt,
+		childExtHeightPt: own.childExtHeightPt,
+		compositeRotationDeg: composite.angleDeg,
+		compositeMirrored: composite.mirrored
 	};
 }
 function applyGroupTransform(group, childFrame) {
 	const scaleX = group.childExtWidthPt === 0 ? 1 : group.extWidthPt / group.childExtWidthPt;
 	const scaleY = group.childExtHeightPt === 0 ? 1 : group.extHeightPt / group.childExtHeightPt;
+	const widthPt = childFrame.widthPt * scaleX;
+	const heightPt = childFrame.heightPt * scaleY;
+	const canonicalX = group.offXPt + (childFrame.xPt - group.childOffXPt) * scaleX;
+	const canonicalY = group.offYPt + (childFrame.yPt - group.childOffYPt) * scaleY;
+	if (group.compositeRotationDeg === 0 && !group.compositeMirrored) return {
+		xPt: canonicalX,
+		yPt: canonicalY,
+		widthPt,
+		heightPt
+	};
+	const groupCenterX = group.offXPt + group.extWidthPt / 2;
+	const groupCenterY = group.offYPt + group.extHeightPt / 2;
+	const boxCenterX = canonicalX + widthPt / 2;
+	const boxCenterY = canonicalY + heightPt / 2;
+	let dx = boxCenterX - groupCenterX;
+	const dy = boxCenterY - groupCenterY;
+	if (group.compositeMirrored) dx = -dx;
+	const rad = group.compositeRotationDeg * Math.PI / 180;
+	const cos = Math.cos(rad);
+	const sin = Math.sin(rad);
+	const rotatedX = dx * cos - dy * sin;
+	const rotatedY = dx * sin + dy * cos;
 	return {
-		xPt: group.offXPt + (childFrame.xPt - group.childOffXPt) * scaleX,
-		yPt: group.offYPt + (childFrame.yPt - group.childOffYPt) * scaleY,
-		widthPt: childFrame.widthPt * scaleX,
-		heightPt: childFrame.heightPt * scaleY
+		xPt: groupCenterX + rotatedX - widthPt / 2,
+		yPt: groupCenterY + rotatedY - heightPt / 2,
+		widthPt,
+		heightPt
 	};
 }
+function composeShapeRotationDeg(parentTransform, ownRotationDeg) {
+	if (parentTransform === void 0) return normalizeDeg(ownRotationDeg);
+	return composeRotation({
+		angleDeg: parentTransform.compositeRotationDeg,
+		mirrored: parentTransform.compositeMirrored
+	}, {
+		angleDeg: ownRotationDeg,
+		mirrored: false
+	}).angleDeg;
+}
 //#endregion
 exports.EMPTY_THEME = EMPTY_THEME;
 exports.applyGroupTransform = applyGroupTransform;
+exports.composeGroupTransform = composeGroupTransform;
+exports.composeShapeRotationDeg = composeShapeRotationDeg;
 exports.readColorMap = readColorMap;
 exports.readGroupXfrm = readGroupXfrm;
 exports.readSchemeColor = readSchemeColor;

package/dist/typed/shared/drawingml.d.cts

@@ -24,6 +24,20 @@ declare function resolveSchemeColorSlot(schemeVal: string, colorMap: ReadonlyMap
 declare function readSchemeColor(schemeClrEl: XmlElement, colorMap: ReadonlyMap<string, string>, theme: DrawingTheme): Color | undefined;
 declare function readSrgbColor(srgbClrEl: XmlElement): Color | undefined;
 declare function readSolidFillColor(solidFillEl: XmlElement | undefined, colorMap: ReadonlyMap<string, string>, theme: DrawingTheme): Color | undefined;
+interface GroupOwnXfrm {
+  readonly offXPt: number;
+  readonly offYPt: number;
+  readonly extWidthPt: number;
+  readonly extHeightPt: number;
+  readonly childOffXPt: number;
+  readonly childOffYPt: number;
+  readonly childExtWidthPt: number;
+  readonly childExtHeightPt: number;
+  readonly rotationDeg: number;
+  readonly flipH: boolean;
+  readonly flipV: boolean;
+}
+declare function readGroupXfrm(xfrm: XmlElement | undefined): GroupOwnXfrm | undefined;
 interface GroupChildTransform {
   readonly offXPt: number;
   readonly offYPt: number;
@@ -33,8 +47,11 @@ interface GroupChildTransform {
   readonly childOffYPt: number;
   readonly childExtWidthPt: number;
   readonly childExtHeightPt: number;
+  readonly compositeRotationDeg: number;
+  readonly compositeMirrored: boolean;
 }
-declare function readGroupXfrm(xfrm: XmlElement | undefined): GroupChildTransform | undefined;
+declare function composeGroupTransform(own: GroupOwnXfrm | undefined, parent: GroupChildTransform | undefined): GroupChildTransform | undefined;
 declare function applyGroupTransform(group: GroupChildTransform, childFrame: Box): Box;
+declare function composeShapeRotationDeg(parentTransform: GroupChildTransform | undefined, ownRotationDeg: number): number;
 //#endregion
-export { DrawingTheme, DrawingXfrm, EMPTY_THEME, GroupChildTransform, applyGroupTransform, readColorMap, readGroupXfrm, readSchemeColor, readSolidFillColor, readSrgbColor, readTheme, readXfrm, resolveSchemeColorSlot, resolveThemeFontReference };
+export { DrawingTheme, DrawingXfrm, EMPTY_THEME, GroupChildTransform, GroupOwnXfrm, applyGroupTransform, composeGroupTransform, composeShapeRotationDeg, readColorMap, readGroupXfrm, readSchemeColor, readSolidFillColor, readSrgbColor, readTheme, readXfrm, resolveSchemeColorSlot, resolveThemeFontReference };

package/dist/typed/shared/drawingml.d.ts

@@ -24,6 +24,20 @@ declare function resolveSchemeColorSlot(schemeVal: string, colorMap: ReadonlyMap
 declare function readSchemeColor(schemeClrEl: XmlElement, colorMap: ReadonlyMap<string, string>, theme: DrawingTheme): Color | undefined;
 declare function readSrgbColor(srgbClrEl: XmlElement): Color | undefined;
 declare function readSolidFillColor(solidFillEl: XmlElement | undefined, colorMap: ReadonlyMap<string, string>, theme: DrawingTheme): Color | undefined;
+interface GroupOwnXfrm {
+  readonly offXPt: number;
+  readonly offYPt: number;
+  readonly extWidthPt: number;
+  readonly extHeightPt: number;
+  readonly childOffXPt: number;
+  readonly childOffYPt: number;
+  readonly childExtWidthPt: number;
+  readonly childExtHeightPt: number;
+  readonly rotationDeg: number;
+  readonly flipH: boolean;
+  readonly flipV: boolean;
+}
+declare function readGroupXfrm(xfrm: XmlElement | undefined): GroupOwnXfrm | undefined;
 interface GroupChildTransform {
   readonly offXPt: number;
   readonly offYPt: number;
@@ -33,8 +47,11 @@ interface GroupChildTransform {
   readonly childOffYPt: number;
   readonly childExtWidthPt: number;
   readonly childExtHeightPt: number;
+  readonly compositeRotationDeg: number;
+  readonly compositeMirrored: boolean;
 }
-declare function readGroupXfrm(xfrm: XmlElement | undefined): GroupChildTransform | undefined;
+declare function composeGroupTransform(own: GroupOwnXfrm | undefined, parent: GroupChildTransform | undefined): GroupChildTransform | undefined;
 declare function applyGroupTransform(group: GroupChildTransform, childFrame: Box): Box;
+declare function composeShapeRotationDeg(parentTransform: GroupChildTransform | undefined, ownRotationDeg: number): number;
 //#endregion
-export { DrawingTheme, DrawingXfrm, EMPTY_THEME, GroupChildTransform, applyGroupTransform, readColorMap, readGroupXfrm, readSchemeColor, readSolidFillColor, readSrgbColor, readTheme, readXfrm, resolveSchemeColorSlot, resolveThemeFontReference };
+export { DrawingTheme, DrawingXfrm, EMPTY_THEME, GroupChildTransform, GroupOwnXfrm, applyGroupTransform, composeGroupTransform, composeShapeRotationDeg, readColorMap, readGroupXfrm, readSchemeColor, readSolidFillColor, readSrgbColor, readTheme, readXfrm, resolveSchemeColorSlot, resolveThemeFontReference };