@office-open/pptx 0.3.0 → 0.3.2

package/dist/index.mjs

@@ -1,11 +1,11 @@
 import { n as __reExport, r as __require, t as __exportAll } from "./_chunks/chunk-C8fdooHg.mjs";
-import { AppProperties, BaseXmlComponent, BuilderElement, Formatter, ImportedXmlComponent, NextAttributeComponent, Relationships, StringContainer, XmlComponent, chartAttr, convertEmuToInches as emusToInches, convertEmuToPixels as emusToPixels, convertEmuToPoints as emusToPoints, convertInchesToEmu as inchesToEmus, convertPixelsToEmu as pixelsToEmus, convertPointsToEmu as pointsToEmus, getImageType, hashedId, parseCoreProperties, parseRels, readXmlFromZip, uint8ToBase64, uniqueId, uniqueNumericIdCreator, uniqueUuid, unzipToMap, wrapEl } from "@office-open/core";
+import { AppProperties, BaseXmlComponent, BuilderElement, Formatter, ImportedXmlComponent, NextAttributeComponent, RawPassthrough, Relationships, StringContainer, XmlComponent, chartAttr, collectPlaceholderKeys, convertEmuToInches as emusToInches, convertEmuToPixels as emusToPixels, convertEmuToPoints as emusToPoints, convertInchesToEmu as inchesToEmus, convertPixelsToEmu as pixelsToEmus, convertPointsToEmu as pointsToEmus, getImageType, hasPlaceholders, hashedId, isRaw, parseCoreProperties, parseRels, readAllXmlParts, readXmlFromZip, uint8ToBase64, uniqueId, uniqueNumericIdCreator, uniqueUuid, unzipToMap, wrapEl } from "@office-open/core";
 import { ChartCollection, ChartTitle, createChartType } from "@office-open/core/chart";
+import { attr, attrBool, attrNum, attrs, children, escapeXml, findChild, findDeep, textOf, xml } from "@office-open/xml";
 import { BevelPresetType, CompoundLine, LineCap, LineJoin, PathShadeType, PenAlignment, PresetDash, PresetMaterialType, TileFlipMode, buildFill, createBevel, createBottomBevel, createColorElement, createColorTransforms, createEffectList, createGradientFill, createGradientStop, createOutline, createOutline as createOutline$1, createScene3D, createShape3D, extractBlipFillMedia } from "@office-open/core/drawingml";
 import { COLOR_CATEGORIES, LAYOUT_CATEGORIES, STYLE_CATEGORIES, SmartArtCollection, createDataModel } from "@office-open/core/smartart";
 import { Readable } from "stream";
 import { Zip, ZipDeflate, ZipPassThrough, zipSync } from "fflate";
-import { attr, attrBool, attrNum, children, findChild, findDeep, textOf, xml } from "@office-open/xml";
 export * from "@office-open/core/values";
 //#region src/file/content-types/content-types.ts
 /**
@@ -378,6 +378,9 @@ var GroupShapeNonVisualProperties = class extends BuilderElement {
 function buildEndParagraphRunProperties(lang = "en-US") {
 	return { "a:endParaRPr": { _attr: { lang } } };
 }
+function buildEndParagraphRunPropertiesXml(lang = "en-US") {
+	return `<a:endParaRPr${attrs({ lang })}/>`;
+}
 /**
 * a:endParaRPr — End paragraph run properties.
 * Lazy: stores lang, builds XML object in prepForXml.
@@ -458,7 +461,48 @@ var ParagraphProperties = class extends XmlComponent {
 	prepForXml(_context) {
 		return buildParagraphProperties(this.options);
 	}
+	toXml() {
+		return buildParagraphPropertiesXml(this.options);
+	}
 };
+function buildBulletChildrenXml(options) {
+	if (options.type === "none") return "<a:buNone/>";
+	let s = "";
+	if (options.color) s += `<a:buClr><a:srgbClr${attrs({ val: options.color.replace("#", "") })}/></a:buClr>`;
+	if (options.size !== void 0) s += `<a:buSzPct${attrs({ val: `${options.size}%` })}/>`;
+	s += `<a:buFont${attrs({
+		typeface: "Arial",
+		panose: "020B0604020202020204",
+		pitchFamily: "34",
+		charset: "0"
+	})}/>`;
+	if (options.type === "char") s += `<a:buChar${attrs({ char: options.char ?? "•" })}/>`;
+	else if (options.type === "autoNum") {
+		const buAttrs = { type: options.format ?? "arabicPeriod" };
+		if (options.startAt !== void 0) buAttrs.startAt = options.startAt;
+		s += `<a:buAutoNum${attrs(buAttrs)}/>`;
+	}
+	return s;
+}
+function buildParagraphPropertiesXml(options) {
+	const attrStr = attrs({
+		algn: options.alignment ? TextAlignment[options.alignment] : void 0,
+		lvl: options.indentLevel,
+		marL: options.marginIndent,
+		marR: options.marginRight,
+		defTabSz: options.defTabSize
+	});
+	const body = [];
+	if (options.lineSpacing !== void 0) body.push(`<a:lnSpc><a:spcPct${attrs({ val: options.lineSpacing * 1e3 })}/></a:lnSpc>`);
+	if (options.lineSpacingPoints !== void 0) body.push(`<a:lnSpc><a:spcPts${attrs({ val: options.lineSpacingPoints * 100 })}/></a:lnSpc>`);
+	if (options.marginBottom !== void 0 || options.marginTop !== void 0) body.push(`<a:spcAft><a:spcPts${attrs({ val: options.marginBottom ?? 0 })}/></a:spcAft>`);
+	if (options.marginTop !== void 0) body.push(`<a:spcBef><a:spcPts${attrs({ val: options.marginTop })}/></a:spcBef>`);
+	if (options.bullet) body.push(buildBulletChildrenXml(options.bullet));
+	else if (options.bulletNone !== false) body.push("<a:buNone/>");
+	if (!attrStr && body.length === 0) return "";
+	if (body.length === 0) return `<a:pPr${attrStr}/>`;
+	return `<a:pPr${attrStr}>${body.join("")}</a:pPr>`;
+}
 //#endregion
 //#region src/file/shape/paragraph/run-properties.ts
 let nextHyperlinkId = 1;
@@ -492,7 +536,7 @@ function buildRunProperties(options, hyperlinkKey, fillObject) {
 	if (options.lang) attrs.lang = options.lang;
 	if (options.strike) attrs.strike = StrikeStyle[options.strike];
 	if (options.baseline !== void 0) attrs.baseline = options.baseline;
-	if (options.capitalization) attrs.cap = TextCapitalization[options.capitalization];
+	if (options.capitalization) attrs.cap = TextCapitalization[options.capitalization] ?? options.capitalization;
 	if (options.spacing !== void 0) attrs.spc = options.spacing;
 	if (options.noProof !== void 0) attrs.noProof = options.noProof;
 	if (options.dirty !== void 0) attrs.dirty = options.dirty;
@@ -535,7 +579,48 @@ var RunProperties = class extends XmlComponent {
 		if (opts.fill !== void 0) fillObj = buildFill(opts.fill).prepForXml(context) ?? void 0;
 		return buildRunProperties(opts, hyperlinkKey, fillObj);
 	}
+	toXml(context) {
+		const opts = this.options;
+		let hyperlinkKey;
+		if (opts.hyperlink) {
+			hyperlinkKey = `hlink_${nextHyperlinkId++}`;
+			context.fileData?.Hyperlinks?.addHyperlink(hyperlinkKey, opts.hyperlink.url, opts.hyperlink.tooltip);
+		}
+		let fillObj;
+		if (opts.fill !== void 0) fillObj = buildFill(opts.fill).prepForXml(context) ?? void 0;
+		return buildRunPropertiesXml(opts, hyperlinkKey, fillObj);
+	}
 };
+/**
+* String version of buildRunProperties for zero-allocation serialization.
+*/
+function buildRunPropertiesXml(options, hyperlinkKey, fillObject) {
+	const a = {};
+	if (options.fontSize) a.sz = options.fontSize * 100;
+	if (options.bold !== void 0) a.b = options.bold;
+	if (options.italic !== void 0) a.i = options.italic;
+	if (options.underline) a.u = UnderlineStyle[options.underline];
+	if (options.lang) a.lang = options.lang;
+	if (options.strike) a.strike = StrikeStyle[options.strike];
+	if (options.baseline !== void 0) a.baseline = options.baseline;
+	if (options.capitalization) a.cap = TextCapitalization[options.capitalization] ?? options.capitalization;
+	if (options.spacing !== void 0) a.spc = options.spacing;
+	if (options.noProof !== void 0) a.noProof = options.noProof;
+	if (options.dirty !== void 0) a.dirty = options.dirty;
+	const attrStr = attrs(a);
+	const body = [];
+	if (options.font) body.push(`<a:latin${attrs({ typeface: options.font })}/><a:ea${attrs({ typeface: options.font })}/>`);
+	if (options.hyperlink && hyperlinkKey) {
+		const h = { "r:id": `{hlink:${hyperlinkKey}}` };
+		if (options.hyperlink.tooltip) h.tooltip = options.hyperlink.tooltip;
+		body.push(`<a:hlinkClick${attrs(h)}/>`);
+	}
+	if (options.rightToLeft !== void 0) body.push(`<a:rtl${attrs({ val: options.rightToLeft ? 1 : 0 })}/>`);
+	if (fillObject) body.push(xml(fillObject));
+	if (!attrStr && body.length === 0) return "";
+	if (body.length === 0) return `<a:rPr${attrStr}/>`;
+	return `<a:rPr${attrStr}>${body.join("")}</a:rPr>`;
+}
 //#endregion
 //#region src/file/shape/paragraph/run.ts
 /**
@@ -557,6 +642,16 @@ var Run = class extends XmlComponent {
 		if (this.options.text) children.push({ "a:t": [this.options.text] });
 		return { "a:r": children.length === 0 ? {} : children.length === 1 && "_attr" in children[0] ? children[0] : children };
 	}
+	toXml(context) {
+		let s = "<a:r>";
+		if (RunProperties.hasProperties(this.options)) {
+			const rp = new RunProperties(this.options);
+			s += rp.toXml(context);
+		}
+		if (this.options.text) s += `<a:t>${escapeXml(this.options.text)}</a:t>`;
+		s += "</a:r>";
+		return s;
+	}
 };
 //#endregion
 //#region src/file/shape/paragraph/paragraph.ts
@@ -581,6 +676,15 @@ var Paragraph = class extends XmlComponent {
 		children.push(buildEndParagraphRunProperties());
 		return { "a:p": children };
 	}
+	toXml(context) {
+		let s = "<a:p>";
+		const pPr = buildParagraphPropertiesXml(this.options.properties ?? {});
+		if (pPr) s += pPr;
+		if (this.options.children) for (const child of this.options.children) s += child.toXml(context);
+		s += buildEndParagraphRunPropertiesXml();
+		s += "</a:p>";
+		return s;
+	}
 };
 //#endregion
 //#region src/file/table/table-cell-properties.ts
@@ -697,6 +801,25 @@ function buildBodyPr(options) {
 	bodyPrContent.push(...bodyPrChildren);
 	return { "a:bodyPr": bodyPrContent.length === 1 && "_attr" in bodyPrContent[0] ? bodyPrContent[0] : bodyPrContent.length > 0 ? bodyPrContent : {} };
 }
+function buildBodyPrXml(options) {
+	let s = "<a:bodyPr";
+	const a = {};
+	if (options.vertical) a.vert = options.vertical;
+	if (options.anchor) a.anchor = VerticalAlignment[options.anchor];
+	if (options.wrap) a.wrap = options.wrap;
+	if (options.margins?.top !== void 0) a.tIns = options.margins.top;
+	if (options.margins?.bottom !== void 0) a.bIns = options.margins.bottom;
+	if (options.margins?.left !== void 0) a.lIns = options.margins.left;
+	if (options.margins?.right !== void 0) a.rIns = options.margins.right;
+	if (options.columns !== void 0) a.numCol = options.columns;
+	if (options.columnSpacing !== void 0) a.spcCol = options.columnSpacing * 100;
+	s += attrs(a);
+	let inner = "";
+	if (options.autoFit === "normal") inner += "<a:normAutofit/>";
+	else if (options.autoFit === "shape") inner += "<a:spAutoFit/>";
+	else if (options.autoFit === "none") inner += "<a:noAutofit/>";
+	return inner ? `${s}>${inner}</a:bodyPr>` : `${s}/>`;
+}
 /**
 * p:txBody — Text body within a shape.
 * Lazy: stores options, builds XML object in prepForXml.
@@ -721,6 +844,18 @@ var TextBody = class extends XmlComponent {
 		}
 		return { "p:txBody": children };
 	}
+	toXml(context) {
+		let s = "<p:txBody>";
+		s += buildBodyPrXml(this.options);
+		s += "<a:lstStyle/>";
+		if (this.options.paragraphs) for (const p of this.options.paragraphs) {
+			const para = typeof p === "string" ? new Paragraph({ children: [new Run({ text: p })] }) : p;
+			s += para.toXml(context);
+		}
+		else s += new Paragraph().toXml(context);
+		s += "</p:txBody>";
+		return s;
+	}
 };
 //#endregion
 //#region src/file/notes/notes-slide.ts
@@ -931,7 +1066,7 @@ var PresentationProperties = class PresentationProperties extends ImportedXmlCom
 };
 //#endregion
 //#region src/file/presentation/presentation.ts
-const DEFAULT_TEXT_STYLE_OBJ = ImportedXmlComponent.fromXmlString(`<p:defaultTextStyle xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main">
+const DEFAULT_TEXT_STYLE_XML = `<p:defaultTextStyle xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main">
   <a:defPPr><a:defRPr/></a:defPPr>
   <a:lvl1pPr marL="0" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
     <a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr>
@@ -960,7 +1095,8 @@ const DEFAULT_TEXT_STYLE_OBJ = ImportedXmlComponent.fromXmlString(`<p:defaultTex
   <a:lvl9pPr marL="3657600" algn="l" defTabSz="914400" rtl="0" eaLnBrk="1" latinLnBrk="0" hangingPunct="1">
     <a:defRPr sz="1800" kern="1200"><a:solidFill><a:schemeClr val="tx1"/></a:solidFill><a:latin typeface="+mn-lt"/><a:ea typeface="+mn-ea"/><a:cs typeface="+mn-cs"/></a:defRPr>
   </a:lvl9pPr>
-</p:defaultTextStyle>`).prepForXml({ stack: [] });
+</p:defaultTextStyle>`;
+const DEFAULT_TEXT_STYLE_OBJ = ImportedXmlComponent.fromXmlString(DEFAULT_TEXT_STYLE_XML).prepForXml({ stack: [] });
 /**
 * p:presentation — Root element of a PPTX file.
 * Lazy: stores options, builds XML object directly in prepForXml.
@@ -1002,6 +1138,22 @@ var Presentation = class extends BaseXmlComponent {
 		children.push(DEFAULT_TEXT_STYLE_OBJ);
 		return { "p:presentation": children };
 	}
+	toXml(_context) {
+		const opts = this.options;
+		const cx = opts.slideWidth ?? 9144e3;
+		const cy = opts.slideHeight ?? 6858e3;
+		const typeAttr = cx === 914400 && cy === 6858e3 ? " type=\"screen4x3\"" : "";
+		let s = `<p:presentation xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main">`;
+		s += "<p:sldMasterIdLst><p:sldMasterId id=\"2147483648\" r:id=\"rId1\"/></p:sldMasterIdLst>";
+		s += "<p:sldIdLst>";
+		for (let i = 0; i < opts.slideIds.length; i++) s += `<p:sldId id="${opts.slideIds[i]}" r:id="rId${i + 2}"/>`;
+		s += "</p:sldIdLst>";
+		s += `<p:sldSz cx="${cx}" cy="${cy}"${typeAttr}/>`;
+		s += "<p:notesSz cx=\"6858000\" cy=\"9144000\"/>";
+		s += DEFAULT_TEXT_STYLE_XML;
+		s += "</p:presentation>";
+		return s;
+	}
 };
 //#endregion
 //#region src/file/presentation/presentation-wrapper.ts
@@ -2238,6 +2390,49 @@ var Shape = class Shape extends XmlComponent {
 		if (txBodyObj) children.push(txBodyObj);
 		return { "p:sp": children };
 	}
+	toXml(context) {
+		const opts = this.options;
+		const id = this.shapeId;
+		const name = escapeXml(opts.name ?? `Shape ${id}`);
+		let s = "<p:sp><p:nvSpPr>";
+		s += `<p:cNvPr${attrs({
+			id,
+			name
+		})}/>`;
+		s += "<p:cNvSpPr/>";
+		if (opts.placeholder) {
+			const phAttrs = { type: opts.placeholder };
+			if (opts.placeholderIndex !== void 0) phAttrs.idx = opts.placeholderIndex;
+			s += `<p:nvPr><p:ph${attrs(phAttrs)}/></p:nvPr>`;
+		} else s += "<p:nvPr/>";
+		s += "</p:nvSpPr>";
+		const spPrObj = new ShapeProperties({
+			x: opts.x !== void 0 ? pixelsToEmus(opts.x) : void 0,
+			y: opts.y !== void 0 ? pixelsToEmus(opts.y) : void 0,
+			width: opts.width !== void 0 ? pixelsToEmus(opts.width) : void 0,
+			height: opts.height !== void 0 ? pixelsToEmus(opts.height) : void 0,
+			geometry: opts.geometry,
+			fill: opts.fill,
+			outline: opts.outline,
+			effects: opts.effects,
+			flipH: opts.flipH,
+			rotation: opts.rotation
+		}).prepForXml(context);
+		if (spPrObj) s += xml(spPrObj);
+		const txBodyOpts = {
+			paragraphs: opts.paragraphs ?? (opts.text ? [new Paragraph({ children: [new Run({ text: opts.text })] })] : void 0),
+			vertical: opts.textVertical,
+			anchor: opts.textAnchor,
+			autoFit: opts.textAutoFit,
+			wrap: opts.textWrap,
+			margins: opts.textMargins,
+			columns: opts.textColumns,
+			columnSpacing: opts.textColumnSpacing
+		};
+		s += new TextBody(txBodyOpts).toXml(context);
+		s += "</p:sp>";
+		return s;
+	}
 };
 //#endregion
 //#region src/file/transition/transition.ts
@@ -2289,47 +2484,10 @@ var Transition = class extends BaseXmlComponent {
 };
 //#endregion
 //#region src/file/slide/slide.ts
-/**
-* p:nvGrpSpPr singleton — non-visual properties for shape tree.
-*/
-const NV_GRP_SP_PR = { "p:nvGrpSpPr": [
-	{ "p:cNvPr": { _attr: {
-		id: 1,
-		name: ""
-	} } },
-	{ "p:cNvGrpSpPr": {} },
-	{ "p:nvPr": {} }
-] };
-/**
-* p:grpSpPr singleton — group shape properties with default transform.
-*/
-const GRP_SP_PR = { "p:grpSpPr": { "a:xfrm": [
-	{ "a:off": { _attr: {
-		x: 0,
-		y: 0
-	} } },
-	{ "a:ext": { _attr: {
-		cx: 0,
-		cy: 0
-	} } },
-	{ "a:chOff": { _attr: {
-		x: 0,
-		y: 0
-	} } },
-	{ "a:chExt": { _attr: {
-		cx: 0,
-		cy: 0
-	} } }
-] } };
-/**
-* p:clrMapOvr singleton — color map override.
-*/
-const CLR_MAP_OVR = { "p:clrMapOvr": [{ "a:masterClrMapping": {} }] };
-const XMLNS_ATTRS = { _attr: {
-	"xmlns:a": "http://schemas.openxmlformats.org/drawingml/2006/main",
-	"xmlns:r": "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
-	"xmlns:p": "http://schemas.openxmlformats.org/presentationml/2006/main"
-} };
+const NV_GRP_SP_PR = "<p:nvGrpSpPr><p:cNvPr id=\"1\" name=\"\"/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr>";
+const GRP_SP_PR = "<p:grpSpPr><a:xfrm><a:off x=\"0\" y=\"0\"/><a:ext cx=\"0\" cy=\"0\"/><a:chOff x=\"0\" y=\"0\"/><a:chExt cx=\"0\" cy=\"0\"/></a:xfrm></p:grpSpPr>";
+const CLR_MAP_OVR = "<p:clrMapOvr><a:masterClrMapping/></p:clrMapOvr>";
+const XMLNS = " xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:p=\"http://schemas.openxmlformats.org/presentationml/2006/main\"";
 function collectAnimations(children) {
 	const entries = [];
 	for (const child of children) if (child instanceof Shape) {
@@ -2359,20 +2517,48 @@ var Slide = class extends BaseXmlComponent {
 	}
 	prepForXml(context) {
 		const children = [];
-		children.push(XMLNS_ATTRS);
+		children.push({ _attr: {
+			"xmlns:a": "http://schemas.openxmlformats.org/drawingml/2006/main",
+			"xmlns:r": "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
+			"xmlns:p": "http://schemas.openxmlformats.org/presentationml/2006/main"
+		} });
 		const cSldChildren = [];
 		if (this.background) {
 			const bgObj = this.background.prepForXml(context);
 			if (bgObj) cSldChildren.push(bgObj);
 		}
-		const spTreeChildren = [NV_GRP_SP_PR, GRP_SP_PR];
+		const spTreeChildren = [{ "p:nvGrpSpPr": [
+			{ "p:cNvPr": { _attr: {
+				id: 1,
+				name: ""
+			} } },
+			{ "p:cNvGrpSpPr": {} },
+			{ "p:nvPr": {} }
+		] }, { "p:grpSpPr": { "a:xfrm": [
+			{ "a:off": { _attr: {
+				x: 0,
+				y: 0
+			} } },
+			{ "a:ext": { _attr: {
+				cx: 0,
+				cy: 0
+			} } },
+			{ "a:chOff": { _attr: {
+				x: 0,
+				y: 0
+			} } },
+			{ "a:chExt": { _attr: {
+				cx: 0,
+				cy: 0
+			} } }
+		] } }];
 		for (const child of this.children) {
 			const obj = child.prepForXml(context);
 			if (obj) spTreeChildren.push(obj);
 		}
 		cSldChildren.push({ "p:spTree": spTreeChildren });
 		children.push({ "p:cSld": cSldChildren });
-		children.push(CLR_MAP_OVR);
+		children.push({ "p:clrMapOvr": [{ "a:masterClrMapping": {} }] });
 		if (this.transition) {
 			const transObj = buildTransition(this.transition);
 			if (transObj) children.push(transObj);
@@ -2384,6 +2570,35 @@ var Slide = class extends BaseXmlComponent {
 		}
 		return { "p:sld": children };
 	}
+	toXml(context) {
+		let s = `<p:sld${XMLNS}>`;
+		s += "<p:cSld>";
+		if (this.background) {
+			const bgObj = this.background.prepForXml(context);
+			if (bgObj) s += xml(bgObj);
+		}
+		s += "<p:spTree>";
+		s += NV_GRP_SP_PR;
+		s += GRP_SP_PR;
+		for (const child of this.children) if (typeof child.toXml === "function") s += child.toXml(context);
+		else {
+			const obj = child.prepForXml(context);
+			if (obj) s += xml(obj);
+		}
+		s += "</p:spTree></p:cSld>";
+		s += CLR_MAP_OVR;
+		if (this.transition) {
+			const transObj = buildTransition(this.transition);
+			if (transObj) s += xml(transObj);
+		}
+		const animations = collectAnimations(this.children);
+		if (animations.length > 0) {
+			const timingObj = new SlideTiming(animations).prepForXml(context);
+			if (timingObj) s += xml(timingObj);
+		}
+		s += "</p:sld>";
+		return s;
+	}
 };
 //#endregion
 //#region src/file/table-styles.ts
@@ -4412,38 +4627,23 @@ var Compiler = class {
 			}
 		};
 		mapping["Theme"] = {
-			data: xml(this.formatter.format(file.Theme, context), {
-				declaration,
-				indent
-			}),
+			data: this.formatter.formatToXml(file.Theme, context, declaration),
 			path: "ppt/theme/theme1.xml"
 		};
 		mapping["TableStyles"] = {
-			data: xml(this.formatter.format(file.TableStyles, context), {
-				declaration,
-				indent
-			}),
+			data: this.formatter.formatToXml(file.TableStyles, context, declaration),
 			path: "ppt/tableStyles.xml"
 		};
 		mapping["PresProps"] = {
-			data: xml(this.formatter.format(file.PresProps, context), {
-				declaration,
-				indent
-			}),
+			data: this.formatter.formatToXml(file.PresProps, context, declaration),
 			path: "ppt/presProps.xml"
 		};
 		mapping["ViewProps"] = {
-			data: xml(this.formatter.format(file.ViewProps, context), {
-				declaration,
-				indent
-			}),
+			data: this.formatter.formatToXml(file.ViewProps, context, declaration),
 			path: "ppt/viewProps.xml"
 		};
 		mapping["SlideMaster"] = {
-			data: xml(this.formatter.format(file.SlideMaster, context), {
-				declaration,
-				indent
-			}),
+			data: this.formatter.formatToXml(file.SlideMaster, context, declaration),
 			path: "ppt/slideMasters/slideMaster1.xml"
 		};
 		mapping["SlideMasterRelationships"] = {
@@ -4451,10 +4651,7 @@ var Compiler = class {
 			path: "ppt/slideMasters/_rels/slideMaster1.xml.rels"
 		};
 		mapping["SlideLayout"] = {
-			data: xml(this.formatter.format(file.SlideLayout, context), {
-				declaration,
-				indent
-			}),
+			data: this.formatter.formatToXml(file.SlideLayout, context, declaration),
 			path: "ppt/slideLayouts/slideLayout1.xml"
 		};
 		mapping["SlideLayoutRelationships"] = {
@@ -4475,10 +4672,7 @@ var Compiler = class {
 				path: "ppt/notesMasters/_rels/notesMaster1.xml.rels"
 			};
 		}
-		const presentationXml = xml(this.formatter.format(file.PresentationWrapper.View, context), {
-			declaration,
-			indent
-		});
+		const presentationXml = this.formatter.formatToXml(file.PresentationWrapper.View, context, declaration);
 		let currentImageCount = 0;
 		const mediaData = this.imageReplacer.getMediaData(presentationXml, file.Media);
 		const presImageOffset = file.PresentationWrapper.Relationships.RelationshipCount + 1;
@@ -4497,10 +4691,7 @@ var Compiler = class {
 		};
 		for (let i = 0; i < file.Slides.length; i++) {
 			const slideWrapper = file.SlideWrappers[i];
-			const slideXml = xml(this.formatter.format(slideWrapper.View, context), {
-				declaration,
-				indent
-			});
+			const slideXml = this.formatter.formatToXml(slideWrapper.View, context, declaration);
 			const slideMediaData = this.imageReplacer.getMediaData(slideXml, file.Media);
 			const slideImageOffset = slideWrapper.Relationships.RelationshipCount + 1;
 			slideMediaData.forEach((image, idx) => {
@@ -4508,58 +4699,50 @@ var Compiler = class {
 			});
 			let replacedSlideXml = this.imageReplacer.replace(slideXml, slideMediaData, slideImageOffset);
 			currentImageCount += slideMediaData.length;
-			const chartPlaceholderRegex = /\{chart:([^}]+)\}/g;
-			const slideChartKeys = [];
-			let match;
-			const slideXmlForCharts = replacedSlideXml;
-			while ((match = chartPlaceholderRegex.exec(slideXmlForCharts)) !== null) if (!slideChartKeys.includes(match[1])) slideChartKeys.push(match[1]);
-			if (slideChartKeys.length > 0) {
-				const slideChartOffset = slideWrapper.Relationships.RelationshipCount + 1;
-				const slideCharts = file.Charts.Array.filter((c) => slideChartKeys.includes(c.key));
-				replacedSlideXml = this.chartReplacer.replace(replacedSlideXml, { Array: slideCharts }, slideChartOffset);
-				slideCharts.forEach((chartData, ci) => {
-					const globalIndex = file.Charts.Array.indexOf(chartData);
-					slideWrapper.Relationships.addRelationship(slideChartOffset + ci, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart", `../charts/chart${globalIndex + 1}.xml`);
-				});
-			}
-			const slideSmartArtKeys = [];
-			const smartArtRegex = /\{smartart:([^}]+)\}/g;
-			let saMatch;
-			while ((saMatch = smartArtRegex.exec(replacedSlideXml)) !== null) if (!slideSmartArtKeys.includes(saMatch[1])) slideSmartArtKeys.push(saMatch[1]);
-			if (slideSmartArtKeys.length > 0) {
-				const slideSmartArts = file.SmartArts.Array.filter((s) => slideSmartArtKeys.includes(s.key));
-				const saOffset = slideWrapper.Relationships.RelationshipCount + 1;
-				replacedSlideXml = this.smartArtReplacer.replace(replacedSlideXml, { Array: slideSmartArts }, saOffset);
-				const saGlobalStart = file.SmartArts.Array.indexOf(slideSmartArts[0]);
-				this.smartArtReplacer.addRelationships({ Array: slideSmartArts }, (id, type, target) => {
-					slideWrapper.Relationships.addRelationship(id, type, target);
-				}, saOffset, saGlobalStart);
-			}
-			const hlinkPlaceholderRegex = /\{hlink:([^}]+)\}/g;
-			const slideHlinkKeys = [];
-			let hlinkMatch;
-			while ((hlinkMatch = hlinkPlaceholderRegex.exec(replacedSlideXml)) !== null) if (!slideHlinkKeys.includes(hlinkMatch[1])) slideHlinkKeys.push(hlinkMatch[1]);
-			if (slideHlinkKeys.length > 0) {
-				const slideHlinks = file.Hyperlinks.Array.filter((h) => slideHlinkKeys.includes(h.key));
-				const hlinkOffset = slideWrapper.Relationships.RelationshipCount + 1;
-				replacedSlideXml = this.hyperlinkReplacer.replace(replacedSlideXml, slideHlinks, hlinkOffset);
-				slideHlinks.forEach((hlink, hi) => {
-					slideWrapper.Relationships.addRelationship(hlinkOffset + hi, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink", hlink.url, "External");
-				});
-			}
-			const slideMediaRefs = this.mediaReplacer.getMediaRefs(replacedSlideXml, file.Media);
-			const slideVideoRefs = this.mediaReplacer.getVideoRefs(replacedSlideXml, file.Media);
-			if ([...slideMediaRefs, ...slideVideoRefs].length > 0) {
-				const mediaOffset = slideWrapper.Relationships.RelationshipCount + 1;
-				const videoOffset = mediaOffset + slideMediaRefs.length;
-				replacedSlideXml = this.mediaReplacer.replaceMedia(replacedSlideXml, slideMediaRefs, mediaOffset);
-				replacedSlideXml = this.mediaReplacer.replaceVideo(replacedSlideXml, slideVideoRefs, videoOffset);
-				slideMediaRefs.forEach((media, mi) => {
-					slideWrapper.Relationships.addRelationship(mediaOffset + mi, "http://schemas.microsoft.com/office/2007/relationships/media", `../media/${media.fileName}`);
-				});
-				slideVideoRefs.forEach((video, vi) => {
-					slideWrapper.Relationships.addRelationship(videoOffset + vi, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/video", `../media/${video.fileName}`);
-				});
+			if (hasPlaceholders(replacedSlideXml)) {
+				const slideChartKeys = collectPlaceholderKeys(replacedSlideXml, "chart:");
+				if (slideChartKeys.length > 0) {
+					const slideChartOffset = slideWrapper.Relationships.RelationshipCount + 1;
+					const slideCharts = file.Charts.Array.filter((c) => slideChartKeys.includes(c.key));
+					replacedSlideXml = this.chartReplacer.replace(replacedSlideXml, { Array: slideCharts }, slideChartOffset);
+					slideCharts.forEach((chartData, ci) => {
+						const globalIndex = file.Charts.Array.indexOf(chartData);
+						slideWrapper.Relationships.addRelationship(slideChartOffset + ci, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart", `../charts/chart${globalIndex + 1}.xml`);
+					});
+				}
+				const slideSmartArtKeys = collectPlaceholderKeys(replacedSlideXml, "smartart:");
+				if (slideSmartArtKeys.length > 0) {
+					const slideSmartArts = file.SmartArts.Array.filter((s) => slideSmartArtKeys.includes(s.key));
+					const saOffset = slideWrapper.Relationships.RelationshipCount + 1;
+					replacedSlideXml = this.smartArtReplacer.replace(replacedSlideXml, { Array: slideSmartArts }, saOffset);
+					const saGlobalStart = file.SmartArts.Array.indexOf(slideSmartArts[0]);
+					this.smartArtReplacer.addRelationships({ Array: slideSmartArts }, (id, type, target) => {
+						slideWrapper.Relationships.addRelationship(id, type, target);
+					}, saOffset, saGlobalStart);
+				}
+				const slideHlinkKeys = collectPlaceholderKeys(replacedSlideXml, "hlink:");
+				if (slideHlinkKeys.length > 0) {
+					const slideHlinks = file.Hyperlinks.Array.filter((h) => slideHlinkKeys.includes(h.key));
+					const hlinkOffset = slideWrapper.Relationships.RelationshipCount + 1;
+					replacedSlideXml = this.hyperlinkReplacer.replace(replacedSlideXml, slideHlinks, hlinkOffset);
+					slideHlinks.forEach((hlink, hi) => {
+						slideWrapper.Relationships.addRelationship(hlinkOffset + hi, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink", hlink.url, "External");
+					});
+				}
+				const slideMediaRefs = this.mediaReplacer.getMediaRefs(replacedSlideXml, file.Media);
+				const slideVideoRefs = this.mediaReplacer.getVideoRefs(replacedSlideXml, file.Media);
+				if (slideMediaRefs.length > 0 || slideVideoRefs.length > 0) {
+					const mediaOffset = slideWrapper.Relationships.RelationshipCount + 1;
+					const videoOffset = mediaOffset + slideMediaRefs.length;
+					replacedSlideXml = this.mediaReplacer.replaceMedia(replacedSlideXml, slideMediaRefs, mediaOffset);
+					replacedSlideXml = this.mediaReplacer.replaceVideo(replacedSlideXml, slideVideoRefs, videoOffset);
+					slideMediaRefs.forEach((media, mi) => {
+						slideWrapper.Relationships.addRelationship(mediaOffset + mi, "http://schemas.microsoft.com/office/2007/relationships/media", `../media/${media.fileName}`);
+					});
+					slideVideoRefs.forEach((video, vi) => {
+						slideWrapper.Relationships.addRelationship(videoOffset + vi, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/video", `../media/${video.fileName}`);
+					});
+				}
 			}
 			mapping[`Slide${i}`] = {
 				data: replacedSlideXml,
@@ -4587,41 +4770,41 @@ var Compiler = class {
 		const files = {};
 		for (const key of Object.keys(mapping)) {
 			const entry = mapping[key];
-			files[entry.path] = textToUint8Array(entry.data);
+			files[entry.path] = [textToUint8Array(entry.data), { level: 0 }];
 		}
 		for (const override of overrides) files[override.path] = override.data instanceof Uint8Array ? override.data : textToUint8Array(override.data);
 		for (let i = 0; i < file.Charts.Array.length; i++) {
 			const chartData = file.Charts.Array[i];
-			files[`ppt/charts/chart${i + 1}.xml`] = textToUint8Array(xml(this.formatter.format(chartData.chartSpace, context), {
+			files[`ppt/charts/chart${i + 1}.xml`] = [textToUint8Array(xml(this.formatter.format(chartData.chartSpace, context), {
 				declaration,
 				indent
-			}));
-			files[`ppt/charts/_rels/chart${i + 1}.xml.rels`] = textToUint8Array(xml({ Relationships: { _attr: { xmlns: "http://schemas.openxmlformats.org/package/2006/relationships" } } }, { declaration: {
+			})), { level: 0 }];
+			files[`ppt/charts/_rels/chart${i + 1}.xml.rels`] = [textToUint8Array(xml({ Relationships: { _attr: { xmlns: "http://schemas.openxmlformats.org/package/2006/relationships" } } }, { declaration: {
 				encoding: "UTF-8",
 				standalone: "yes"
-			} }));
+			} })), { level: 0 }];
 		}
 		for (let i = 0; i < file.SmartArts.Array.length; i++) {
 			const smartArtData = file.SmartArts.Array[i];
-			files[`ppt/diagrams/data${i + 1}.xml`] = textToUint8Array(xml(this.formatter.format(smartArtData.dataModel, context), {
+			files[`ppt/diagrams/data${i + 1}.xml`] = [textToUint8Array(xml(this.formatter.format(smartArtData.dataModel, context), {
 				declaration,
 				indent
-			}));
-			files[`ppt/diagrams/layout${i + 1}.xml`] = textToUint8Array(getLayoutXml(smartArtData.layout));
-			files[`ppt/diagrams/quickStyle${i + 1}.xml`] = textToUint8Array(getStyleXml(smartArtData.style));
-			files[`ppt/diagrams/colors${i + 1}.xml`] = textToUint8Array(getColorXml(smartArtData.color));
-			files[`ppt/diagrams/drawing${i + 1}.xml`] = textToUint8Array(DEFAULT_DRAWING_XML);
+			})), { level: 0 }];
+			files[`ppt/diagrams/layout${i + 1}.xml`] = [textToUint8Array(getLayoutXml(smartArtData.layout)), { level: 0 }];
+			files[`ppt/diagrams/quickStyle${i + 1}.xml`] = [textToUint8Array(getStyleXml(smartArtData.style)), { level: 0 }];
+			files[`ppt/diagrams/colors${i + 1}.xml`] = [textToUint8Array(getColorXml(smartArtData.color)), { level: 0 }];
+			files[`ppt/diagrams/drawing${i + 1}.xml`] = [textToUint8Array(DEFAULT_DRAWING_XML), { level: 0 }];
 		}
 		for (let i = 0; i < file.NotesSlides.length; i++) {
 			const notesSlide = file.NotesSlides[i];
-			files[`ppt/notesSlides/notesSlide${i + 1}.xml`] = textToUint8Array(xml(this.formatter.format(notesSlide, context), {
+			files[`ppt/notesSlides/notesSlide${i + 1}.xml`] = [textToUint8Array(xml(this.formatter.format(notesSlide, context), {
 				declaration,
 				indent
-			}));
-			files[`ppt/notesSlides/_rels/notesSlide${i + 1}.xml.rels`] = textToUint8Array(xml({ Relationships: { _attr: { xmlns: "http://schemas.openxmlformats.org/package/2006/relationships" } } }, { declaration: {
+			})), { level: 0 }];
+			files[`ppt/notesSlides/_rels/notesSlide${i + 1}.xml.rels`] = [textToUint8Array(xml({ Relationships: { _attr: { xmlns: "http://schemas.openxmlformats.org/package/2006/relationships" } } }, { declaration: {
 				encoding: "UTF-8",
 				standalone: "yes"
-			} }));
+			} })), { level: 0 }];
 		}
 		for (const image of file.Media.Array) {
 			files[`ppt/media/${image.fileName}`] = [image.data, { level: 0 }];
@@ -4749,7 +4932,10 @@ function resolveSlideMediaPath(relsTarget) {
 	if (relsTarget.startsWith("../")) return `ppt/${relsTarget.replace("../", "")}`;
 	return `ppt/${relsTarget}`;
 }
+const relsCache = /* @__PURE__ */ new Map();
 function getSlideRels(ctx, slidePath) {
+	const cached = relsCache.get(slidePath);
+	if (cached) return cached;
 	const relsMap = /* @__PURE__ */ new Map();
 	const relsPath = slidePath.replace("ppt/slides/", "ppt/slides/_rels/") + ".rels";
 	const rels = parseRels(ctx.zip, relsPath);
@@ -4757,6 +4943,7 @@ function getSlideRels(ctx, slidePath) {
 		target: rel.target,
 		type: rel.type
 	});
+	relsCache.set(slidePath, relsMap);
 	return relsMap;
 }
 //#endregion
@@ -4814,16 +5001,72 @@ function parseFill(spPr) {
 				color
 			});
 		}
-		const angle = attrNum(gradFill, "lin") ? attrNum(findChild(gradFill, "a:lin"), "ang") : void 0;
-		return {
+		const result = {
 			type: "gradient",
-			stops,
-			...angle !== void 0 && { angle }
+			stops
 		};
+		const lin = findChild(gradFill, "a:lin");
+		if (lin) {
+			const angle = attrNum(lin, "ang");
+			const scaled = attr(lin, "scaled");
+			if (angle !== void 0) result.angle = angle;
+			if (scaled !== void 0) result.scaled = scaled === "1";
+		}
+		const path = findChild(gradFill, "a:path");
+		if (path) {
+			result.path = attr(path, "path") ?? "circle";
+			const fillToRect = findChild(path, "a:fillToRect");
+			if (fillToRect) result.fillToRect = {
+				l: attr(fillToRect, "l"),
+				t: attr(fillToRect, "t"),
+				r: attr(fillToRect, "r"),
+				b: attr(fillToRect, "b")
+			};
+		}
+		return result;
 	}
 	if (findChild(spPr, "a:noFill")) return { type: "none" };
-	if (findChild(spPr, "a:pattFill")) return { type: "pattern" };
-	if (findChild(spPr, "a:blipFill")) return { type: "blip" };
+	const pattFill = findChild(spPr, "a:pattFill");
+	if (pattFill) {
+		const prst = attr(pattFill, "prst");
+		const fgClr = findChild(pattFill, "a:fgClr");
+		const bgClr = findChild(pattFill, "a:bgClr");
+		const fg = fgClr ? findChild(fgClr, "a:srgbClr") ? attr(findChild(fgClr, "a:srgbClr"), "val") : findChild(fgClr, "a:schemeClr") ? attr(findChild(fgClr, "a:schemeClr"), "val") : void 0 : void 0;
+		const bg = bgClr ? findChild(bgClr, "a:srgbClr") ? attr(findChild(bgClr, "a:srgbClr"), "val") : findChild(bgClr, "a:schemeClr") ? attr(findChild(bgClr, "a:schemeClr"), "val") : void 0 : void 0;
+		return {
+			type: "pattern",
+			pattern: prst,
+			...fg && { fg },
+			...bg && { bg }
+		};
+	}
+	const blipFill = findChild(spPr, "a:blipFill");
+	if (blipFill) {
+		const result = { type: "blip" };
+		const blip = findChild(blipFill, "a:blip");
+		if (blip) {
+			const embed = attr(blip, "r:embed");
+			const link = attr(blip, "r:link");
+			if (embed) result.embed = embed;
+			if (link) result.link = link;
+		}
+		const stretch = findChild(blipFill, "a:stretch");
+		if (stretch) {
+			result.stretch = true;
+			const fillRect = findChild(stretch, "a:fillRect");
+			if (fillRect) result.fillRect = {
+				l: attr(fillRect, "l"),
+				t: attr(fillRect, "t"),
+				r: attr(fillRect, "r"),
+				b: attr(fillRect, "b")
+			};
+		}
+		if (findChild(blipFill, "a:tile")) {
+			delete result.stretch;
+			result.tile = true;
+		}
+		return result;
+	}
 }
 function parseOutline(spPr) {
 	const ln = findChild(spPr, "a:ln");
@@ -4851,6 +5094,33 @@ function parseOutline(spPr) {
 	}
 	if (findChild(ln, "a:round")) result.round = true;
 	if (findChild(ln, "a:bevel")) result.bevel = true;
+	const headEnd = findChild(ln, "a:headEnd");
+	if (headEnd) {
+		const he = {};
+		const type = attr(headEnd, "type");
+		const w = attrNum(headEnd, "w");
+		const len = attrNum(headEnd, "len");
+		if (type) he.type = type;
+		if (w !== void 0) he.width = w;
+		if (len !== void 0) he.length = len;
+		if (Object.keys(he).length > 0) result.headEnd = he;
+	}
+	const tailEnd = findChild(ln, "a:tailEnd");
+	if (tailEnd) {
+		const te = {};
+		const type = attr(tailEnd, "type");
+		const w = attrNum(tailEnd, "w");
+		const len = attrNum(tailEnd, "len");
+		if (type) te.type = type;
+		if (w !== void 0) te.width = w;
+		if (len !== void 0) te.length = len;
+		if (Object.keys(te).length > 0) result.tailEnd = te;
+	}
+	const join = findChild(ln, "a:join");
+	if (join) {
+		const type = attr(join, "type");
+		if (type) result.join = type;
+	}
 	if (findChild(ln, "a:noFill")) result.width = 0;
 	return Object.keys(result).length > 0 ? result : void 0;
 }
@@ -4878,13 +5148,55 @@ function parseEffects(spPr) {
 		}
 		result.outerShadow = shadow;
 	}
-	if (findChild(effectLst, "a:innerShdw")) result.innerShadow = {};
+	const innerShdw = findChild(effectLst, "a:innerShdw");
+	if (innerShdw) {
+		const shadow = {};
+		const blurRad = attrNum(innerShdw, "blurRad");
+		const dist = attrNum(innerShdw, "dist");
+		const dir = attrNum(innerShdw, "dir");
+		const rotWithShape = attr(innerShdw, "rotWithShape");
+		if (blurRad !== void 0) shadow.blurRadius = blurRad;
+		if (dist !== void 0) shadow.distance = dist;
+		if (dir !== void 0) shadow.direction = dir;
+		if (rotWithShape !== void 0) shadow.rotateWithShape = rotWithShape === "1";
+		const solidFill = findChild(innerShdw, "a:solidFill");
+		if (solidFill) {
+			const srgbClr = findChild(solidFill, "a:srgbClr");
+			if (srgbClr) shadow.color = attr(srgbClr, "val");
+		}
+		result.innerShadow = shadow;
+	}
 	const glow = findChild(effectLst, "a:glow");
 	if (glow) {
 		const radius = attrNum(glow, "rad");
-		if (radius !== void 0) result.glow = { radius };
+		const glowObj = {};
+		if (radius !== void 0) glowObj.radius = radius;
+		const solidFill = findChild(glow, "a:solidFill");
+		if (solidFill) {
+			const srgbClr = findChild(solidFill, "a:srgbClr");
+			if (srgbClr) glowObj.color = attr(srgbClr, "val");
+		}
+		if (Object.keys(glowObj).length > 0) result.glow = glowObj;
+	}
+	const reflection = findChild(effectLst, "a:reflection");
+	if (reflection) {
+		const refObj = {};
+		const blurRad = attrNum(reflection, "blurRad");
+		const dist = attrNum(reflection, "dist");
+		const dir = attrNum(reflection, "dir");
+		const fadeDir = attrNum(reflection, "fadeDir");
+		const stA = attrNum(reflection, "stA");
+		const stB = attrNum(reflection, "stB");
+		const rotWithShape = attr(reflection, "rotWithShape");
+		if (blurRad !== void 0) refObj.blurRadius = blurRad;
+		if (dist !== void 0) refObj.distance = dist;
+		if (dir !== void 0) refObj.direction = dir;
+		if (fadeDir !== void 0) refObj.fadeDirection = fadeDir;
+		if (stA !== void 0) refObj.startAlpha = stA;
+		if (stB !== void 0) refObj.endAlpha = stB;
+		if (rotWithShape !== void 0) refObj.rotateWithShape = rotWithShape === "1";
+		if (Object.keys(refObj).length > 0) result.reflection = refObj;
 	}
-	if (findChild(effectLst, "a:reflection")) result.reflection = {};
 	return Object.keys(result).length > 0 ? result : void 0;
 }
 //#endregion
@@ -5209,6 +5521,23 @@ function parsePptxTable(graphicFrame, ctx) {
 	}
 	const tbl = findDeep(graphicFrame, "a:tbl")[0];
 	if (!tbl) return void 0;
+	const tblPr = findChild(tbl, "a:tblPr");
+	if (tblPr) {
+		const bandRow = attr(tblPr, "bandRow");
+		const bandCol = attr(tblPr, "bandCol");
+		const firstRow = attr(tblPr, "firstRow");
+		const firstCol = attr(tblPr, "firstCol");
+		const lastRow = attr(tblPr, "lastRow");
+		const lastCol = attr(tblPr, "lastCol");
+		if (bandRow || bandCol || firstRow || firstCol || lastRow || lastCol) result.tableStyle = {
+			...bandRow === "1" && { bandRow: true },
+			...bandCol === "1" && { bandCol: true },
+			...firstRow === "1" && { firstRow: true },
+			...firstCol === "1" && { firstCol: true },
+			...lastRow === "1" && { lastRow: true },
+			...lastCol === "1" && { lastCol: true }
+		};
+	}
 	for (const tr of tbl.elements ?? []) {
 		if (tr.name !== "a:tr") continue;
 		const row = { cells: [] };
@@ -5250,6 +5579,32 @@ function parsePptxTable(graphicFrame, ctx) {
 				}
 				const tcW = attrNum(tcPr, "w");
 				if (tcW !== void 0) cell.width = tcW;
+				const tcBorders = findChild(tcPr, "a:tcBorders");
+				if (tcBorders) {
+					const borders = {};
+					for (const border of tcBorders.elements ?? []) if (border.name?.startsWith("a:")) {
+						const borderName = border.name.replace("a:", "");
+						const w = attrNum(border, "w");
+						if (w !== void 0) {
+							const borderDef = { width: w };
+							const solidFill = findChild(border, "a:solidFill");
+							if (solidFill) {
+								const srgbClr = findChild(solidFill, "a:srgbClr");
+								if (srgbClr) {
+									const color = attr(srgbClr, "val");
+									if (color) borderDef.color = color;
+								}
+							}
+							const prstDash = findChild(border, "a:prstDash");
+							if (prstDash) {
+								const dashVal = attr(prstDash, "val");
+								if (dashVal) borderDef.dashStyle = dashVal;
+							}
+							borders[borderName] = borderDef;
+						}
+					}
+					if (Object.keys(borders).length > 0) cell.borders = borders;
+				}
 			}
 			const txBody = findChild(tc, "a:txBody");
 			if (txBody) {
@@ -5273,11 +5628,25 @@ function parseSlide(slideXml, ctx, slidePath) {
 	if (bg) result.background = parseSlideBackground(bg);
 	const spTree = findChild(cSld, "p:spTree");
 	if (spTree) for (const child of spTree.elements ?? []) {
+		if (child.name === "p:nvGrpSpPr" || child.name === "p:grpSpPr") continue;
 		const parsed = parseShapeTreeElement(child, ctx, slideRels);
 		if (parsed) result.children.push(parsed);
 	}
 	const transition = findChild(slideXml, "p:transition");
 	if (transition) result.transition = parseTransition(transition);
+	let notesTarget;
+	for (const [, rel] of slideRels) if (rel.type.includes("notesSlide")) {
+		notesTarget = rel.target;
+		break;
+	}
+	if (notesTarget) {
+		const notesPath = notesTarget.startsWith("../") ? notesTarget.replace("../", "ppt/") : `ppt/${notesTarget}`;
+		const notesXml = readXmlFromZip(ctx.zip, notesPath);
+		if (notesXml) {
+			const notesContent = parseSlideNotes(notesXml, ctx);
+			if (notesContent) result.notes = notesContent;
+		}
+	}
 	return result;
 }
 function parseShapeTreeElement(el, ctx, slideRels) {
@@ -5285,9 +5654,78 @@ function parseShapeTreeElement(el, ctx, slideRels) {
 		case "p:sp": return parseShape(el, ctx, slideRels);
 		case "p:pic": return parsePicture(el, ctx, slideRels);
 		case "p:cxnSp": return parseConnector(el, ctx);
-		case "p:graphicFrame": return parsePptxTable(el, ctx);
-		case "p:grpSp": return;
-		default: return;
+		case "p:graphicFrame": return parsePptxTable(el, ctx) ?? {
+			$raw: true,
+			element: el
+		};
+		case "p:grpSp": return parseGroupShape(el, ctx, slideRels);
+		default: return {
+			$raw: true,
+			element: el
+		};
+	}
+}
+/** Recursively parse group shapes */
+function parseGroupShape(grpSp, ctx, slideRels) {
+	const result = { $type: "groupShape" };
+	const nvSpPr = findChild(grpSp, "p:nvGrpSpPr");
+	const cNvPr = findChild(nvSpPr, "p:cNvPr") ?? findChild(nvSpPr, "p:nvPr");
+	if (cNvPr) {
+		const id = attrNum(cNvPr, "id");
+		const name = attr(cNvPr, "name");
+		if (id !== void 0) result.id = id;
+		if (name) result.name = name;
+	}
+	const grpSpPr = findChild(grpSp, "p:grpSpPr");
+	if (grpSpPr) {
+		const xfrm = findChild(grpSpPr, "a:xfrm");
+		if (xfrm) {
+			const off = findChild(xfrm, "a:off");
+			const ext = findChild(xfrm, "a:ext");
+			if (off) {
+				result.x = attrNum(off, "x");
+				result.y = attrNum(off, "y");
+			}
+			if (ext) {
+				result.width = attrNum(ext, "cx");
+				result.height = attrNum(ext, "cy");
+			}
+			const rot = attrNum(xfrm, "rot");
+			if (rot !== void 0 && rot !== 0) result.rotation = rot / 6e4;
+			const flipH = attr(xfrm, "flipH");
+			const flipV = attr(xfrm, "flipV");
+			if (flipH === "1") result.flipH = true;
+			if (flipV === "1") result.flipV = true;
+		}
+	}
+	const childSource = findChild(grpSp, "p:spTree") ?? grpSp;
+	const children = [];
+	for (const child of childSource.elements ?? []) {
+		if (child.name === "p:nvGrpSpPr" || child.name === "p:grpSpPr") continue;
+		const parsed = parseShapeTreeElement(child, ctx, slideRels);
+		if (parsed) children.push(parsed);
+	}
+	if (children.length > 0) result.children = children;
+	return result;
+}
+/** Parse slide notes content */
+function parseSlideNotes(notesXml, ctx) {
+	const cSld = findChild(notesXml, "p:cSld");
+	if (!cSld) return void 0;
+	const spTree = findChild(cSld, "p:spTree");
+	if (!spTree) return void 0;
+	for (const child of spTree.elements ?? []) if (child.name === "p:sp") {
+		const nvPr = findChild(findChild(child, "p:nvSpPr"), "p:nvPr");
+		if (nvPr) {
+			const ph = findChild(nvPr, "p:ph");
+			if (ph && (attr(ph, "type") === "body" || attr(ph, "type") === void 0)) {
+				const txBody = findChild(child, "p:txBody");
+				if (txBody) {
+					const parsed = parseTextBody(txBody, ctx);
+					if (parsed.paragraphs && parsed.paragraphs.length > 0) return parsed.paragraphs;
+				}
+			}
+		}
 	}
 }
 function parseSlideBackground(bg) {
@@ -5304,22 +5742,31 @@ function parseSlideBackground(bg) {
 }
 function parseTransition(transition) {
 	const result = {};
-	for (const child of transition.elements ?? []) if (child.name?.startsWith("p:")) {
-		const type = child.name.replace("p:", "");
-		const spd = attr(transition, "spd");
-		const advClick = attr(transition, "advClick");
-		result.type = type;
-		if (spd) result.speed = spd;
-		if (advClick !== void 0) result.advanceOnClick = advClick === "1";
+	const spd = attr(transition, "spd");
+	const advClick = attr(transition, "advClick");
+	const advTm = attrNum(transition, "advTm");
+	const p14Dur = attrNum(transition, "p14:dur");
+	if (spd) result.speed = spd;
+	if (advClick !== void 0) result.advanceOnClick = advClick === "1";
+	if (advTm !== void 0) result.advanceAfterMs = advTm;
+	if (p14Dur !== void 0) result.durationMs = p14Dur;
+	for (const child of transition.elements ?? []) if (child.name?.startsWith("p:") && child.name !== "p:transition") {
+		result.type = child.name.replace("p:", "");
+		const p14Prst = findChild(child, "p14:prst");
+		if (p14Prst) {
+			const prstVal = attr(p14Prst, "val");
+			if (prstVal) result.preset = prstVal;
+		}
 		break;
 	}
 	return result;
 }
 //#endregion
 //#region src/parse/document.ts
-async function parsePptx(data) {
+async function parsePptx(data, options) {
 	const zip = unzipToMap(data);
 	const ctx = createPptxParseContext(zip);
+	const includeRawParts = options?.includeRawParts !== false;
 	const coreProps = parseCoreProperties(zip);
 	const slides = [];
 	for (const slidePath of ctx.slidePaths) {
@@ -5328,8 +5775,11 @@ async function parsePptx(data) {
 		const slide = parseSlide(slideXml, ctx, slidePath);
 		slides.push(slide);
 	}
+	let $parts;
+	if (includeRawParts) $parts = readAllXmlParts(zip, { skipPaths: ctx.slidePaths });
 	return {
 		slides,
+		...$parts && { $parts },
 		...ctx.slideWidth !== void 0 && { slideWidth: ctx.slideWidth },
 		...ctx.slideHeight !== void 0 && { slideHeight: ctx.slideHeight },
 		...coreProps.title && { title: coreProps.title },
@@ -5340,6 +5790,210 @@ async function parsePptx(data) {
 		...coreProps.lastModifiedBy && { lastModifiedBy: coreProps.lastModifiedBy }
 	};
 }
+//#endregion
+//#region src/parse/convert.ts
+const EMU_PER_PIXEL = 9525;
+/**
+* Convert parsed slide children to constructor-ready BaseXmlComponent[].
+*/
+function toSlideChildren(children) {
+	return children.map(convertSlideChild);
+}
+function convertSlideChild(child) {
+	if (isRaw(child)) return new RawPassthrough(child.element);
+	switch (child.$type) {
+		case "shape": return convertShape(child);
+		case "picture": return convertPicture(child);
+		case "connectorShape": return convertConnectorShape(child);
+		case "table": return convertTable(child);
+		case "groupShape": return convertGroupShape(child);
+		default: return new RawPassthrough(child.element);
+	}
+}
+function convertShape(json) {
+	const { paragraphs, fill, outline, x, y, width, height, rotation, ...rest } = json;
+	return new Shape({
+		...rest,
+		x: x != null ? Math.round(x / EMU_PER_PIXEL) : void 0,
+		y: y != null ? Math.round(y / EMU_PER_PIXEL) : void 0,
+		width: width != null ? Math.round(width / EMU_PER_PIXEL) : void 0,
+		height: height != null ? Math.round(height / EMU_PER_PIXEL) : void 0,
+		rotation: rotation != null ? rotation * 6e4 : void 0,
+		fill: convertFill(fill),
+		outline: convertOutline(outline),
+		paragraphs: paragraphs?.map(convertParagraph)
+	});
+}
+function convertPicture(json) {
+	const { data, type, x, y, width, height, ...rest } = json;
+	return new Picture({
+		...rest,
+		data: base64ToUint8Array(data),
+		type,
+		x: x != null ? Math.round(x / EMU_PER_PIXEL) : void 0,
+		y: y != null ? Math.round(y / EMU_PER_PIXEL) : void 0,
+		width: width != null ? Math.round(width / EMU_PER_PIXEL) : void 0,
+		height: height != null ? Math.round(height / EMU_PER_PIXEL) : void 0
+	});
+}
+function convertConnectorShape(json) {
+	const { outline, x, y, width, height, ...rest } = json;
+	const x1 = x != null ? Math.round(x / EMU_PER_PIXEL) : 0;
+	const y1 = y != null ? Math.round(y / EMU_PER_PIXEL) : 0;
+	const x2 = x != null && width != null ? Math.round((x + width) / EMU_PER_PIXEL) : x1 + 100;
+	const y2 = y != null && height != null ? Math.round((y + height) / EMU_PER_PIXEL) : y1 + 100;
+	return new ConnectorShape({
+		...rest,
+		x1,
+		y1,
+		x2,
+		y2,
+		outline: convertOutline(outline)
+	});
+}
+function convertTable(json) {
+	const { rows, ...rest } = json;
+	return new Table({
+		...rest,
+		rows: rows.map(convertTableRow)
+	});
+}
+function convertGroupShape(json) {
+	const { children, x, y, width, height, rotation, ...rest } = json;
+	return new GroupShape({
+		...rest,
+		x: x != null ? Math.round(x / EMU_PER_PIXEL) : void 0,
+		y: y != null ? Math.round(y / EMU_PER_PIXEL) : void 0,
+		width: width != null ? Math.round(width / EMU_PER_PIXEL) : void 0,
+		height: height != null ? Math.round(height / EMU_PER_PIXEL) : void 0,
+		rotation: rotation != null ? rotation * 6e4 : void 0,
+		children: children ? toSlideChildren(children) : []
+	});
+}
+function convertTableRow(row) {
+	return {
+		cells: (row.cells ?? []).map(convertTableCell),
+		height: row.height
+	};
+}
+function convertTableCell(cell) {
+	return {
+		paragraphs: cell.paragraphs?.map(convertParagraph),
+		columnSpan: cell.columnSpan,
+		rowSpan: cell.rowSpan,
+		fill: convertFill(cell.fill),
+		borders: convertCellBorders(cell.borders),
+		verticalAlign: cell.verticalAlign,
+		width: cell.width
+	};
+}
+function convertParagraph(json) {
+	const { children, text, ...rest } = json;
+	const runs = children?.map(convertRun) ?? (text ? [new Run({ text })] : void 0);
+	return new Paragraph({
+		...rest,
+		children: runs
+	});
+}
+function convertRun(json) {
+	const { fill, underline, strike, capitalization, fontSize, ...rest } = json;
+	return new Run({
+		...rest,
+		fontSize: fontSize != null ? Math.round(fontSize / 100) : void 0,
+		fill: convertFill(fill),
+		underline: mapUnderline(underline),
+		strike: mapStrike(strike),
+		capitalization: mapCapitalization(capitalization)
+	});
+}
+const BORDER_KEY_MAP = {
+	lnT: "top",
+	lnB: "bottom",
+	lnL: "left",
+	lnR: "right",
+	lnH: "insideHorizontal",
+	lnV: "insideVertical"
+};
+function convertCellBorders(borders) {
+	if (!borders) return void 0;
+	const result = {};
+	for (const [key, value] of Object.entries(borders)) {
+		const mappedKey = BORDER_KEY_MAP[key] ?? key;
+		result[mappedKey] = value;
+	}
+	return Object.keys(result).length > 0 ? result : void 0;
+}
+function convertFill(fill) {
+	if (!fill || typeof fill === "string") return fill;
+	return fill;
+}
+function convertOutline(outline) {
+	if (!outline) return void 0;
+	const result = {};
+	if (outline.width != null) result.width = outline.width;
+	if (outline.color != null) result.color = outline.color;
+	if (outline.dashStyle != null) result.dashStyle = mapDash(outline.dashStyle);
+	if (outline.cap != null) result.cap = outline.cap;
+	if (outline.compound != null) result.compound = outline.compound;
+	if (outline.headEnd) result.headEnd = outline.headEnd;
+	if (outline.tailEnd) result.tailEnd = outline.tailEnd;
+	if (outline.join != null) result.join = outline.join;
+	return Object.keys(result).length > 0 ? result : void 0;
+}
+function base64ToUint8Array(base64) {
+	const binary = atob(base64);
+	const bytes = new Uint8Array(binary.length);
+	for (let i = 0; i < binary.length; i++) bytes[i] = binary.charCodeAt(i);
+	return bytes;
+}
+const UNDERLINE_MAP = {
+	sng: "SINGLE",
+	dbl: "DOUBLE",
+	heavy: "HEAVY",
+	dotted: "DOTTED",
+	dash: "DASH",
+	dashDot: "DASH_DOT",
+	dashDotDot: "DASH_DOT_DOT",
+	sysDash: "SYS_DASH",
+	sysDotDash: "SYS_DOT_DASH"
+};
+const STRIKE_MAP = {
+	noStrike: "NONE",
+	sngStrike: "SINGLE",
+	dblStrike: "DOUBLE",
+	heavyStrike: "DOUBLE"
+};
+const CAPITALIZATION_MAP = {
+	none: "NONE",
+	small: "SMALL",
+	all: "ALL"
+};
+const DASH_MAP = {
+	solid: "SOLID",
+	dash: "DASH",
+	dashDot: "DASH_DOT",
+	dashDotDot: "LG_DASH_DOT",
+	dot: "DOT",
+	lgDash: "LARGE_DASH",
+	sysDash: "SYS_DASH",
+	sysDotDash: "SYS_DOT_DASH"
+};
+function mapUnderline(value) {
+	if (!value) return void 0;
+	return UNDERLINE_MAP[value] ?? value;
+}
+function mapStrike(value) {
+	if (!value) return void 0;
+	return STRIKE_MAP[value] ?? value;
+}
+function mapCapitalization(value) {
+	if (!value) return void 0;
+	return CAPITALIZATION_MAP[value] ?? value;
+}
+function mapDash(value) {
+	if (!value) return void 0;
+	return DASH_MAP[value] ?? value;
+}
 __reExport(/* @__PURE__ */ __exportAll({
 	AppProperties: () => AppProperties,
 	AudioFrame: () => AudioFrame,
@@ -5434,15 +6088,17 @@ __reExport(/* @__PURE__ */ __exportAll({
 	extractBlipFillMedia: () => extractBlipFillMedia,
 	hashedId: () => hashedId,
 	inchesToEmus: () => inchesToEmus,
+	isRaw: () => isRaw,
 	parsePptx: () => parsePptx,
 	percentToTHousandths: () => percentToTHousandths,
 	pixelsToEmus: () => pixelsToEmus,
 	pointsToEmus: () => pointsToEmus,
+	toSlideChildren: () => toSlideChildren,
 	uniqueId: () => uniqueId,
 	uniqueNumericIdCreator: () => uniqueNumericIdCreator,
 	uniqueUuid: () => uniqueUuid
 }), util_exports);
 //#endregion
-export { AppProperties, AudioFrame, Background, BevelPresetType, BlipFill, ChartCollection, ChartFrame, ChartSpace, CompoundLine, ConnectorShape, ContentTypes, CoreProperties, DateTimeField, DefaultNotesMaster, DefaultSlideLayout, DefaultSlideMaster, DefaultTheme, EffectList, EndParagraphRunProperties, Field, File, File as Presentation, GroupShape, GroupShapeProperties, GroupTransform2D, HeaderFooter, LineCap, LineJoin, LineShape, Media, NonVisualDrawingProperties, NonVisualPictureProperties, NonVisualShapeProperties, NotesSlide, Packer, Paragraph, ParagraphProperties, PathShadeType, PenAlignment, Picture, PresentationWrapper, PresetDash, PresetGeometry, PresetMaterialType, PrettifyType, ReflectionAlignment, Relationships, Run, RunProperties, Shape, ShapeProperties, ShapeTree, Slide, SlideNumberField, SlideSizePreset, SmartArtFrame, StrikeStyle, Table, TableCell, TableCellProperties, TableFrame, TableProperties, TableRow, Text, TextAlignment, TextBody, TextCapitalization, TileFlipMode, Transform2D, Transition, UnderlineStyle, VerticalAlignment, VideoFrame, buildFill, convertOutput, createBevel, createBottomBevel, createColorElement, createColorTransforms, createEffectList, createGradientFill, createGradientStop, createOutline, createOutlineCompat, createScene3D, createShape3D, createTransformation, emusToInches, emusToPixels, emusToPoints, extractBlipFillMedia, hashedId, inchesToEmus, parsePptx, percentToTHousandths, pixelsToEmus, pointsToEmus, uniqueId, uniqueNumericIdCreator, uniqueUuid };
+export { AppProperties, AudioFrame, Background, BevelPresetType, BlipFill, ChartCollection, ChartFrame, ChartSpace, CompoundLine, ConnectorShape, ContentTypes, CoreProperties, DateTimeField, DefaultNotesMaster, DefaultSlideLayout, DefaultSlideMaster, DefaultTheme, EffectList, EndParagraphRunProperties, Field, File, File as Presentation, GroupShape, GroupShapeProperties, GroupTransform2D, HeaderFooter, LineCap, LineJoin, LineShape, Media, NonVisualDrawingProperties, NonVisualPictureProperties, NonVisualShapeProperties, NotesSlide, Packer, Paragraph, ParagraphProperties, PathShadeType, PenAlignment, Picture, PresentationWrapper, PresetDash, PresetGeometry, PresetMaterialType, PrettifyType, ReflectionAlignment, Relationships, Run, RunProperties, Shape, ShapeProperties, ShapeTree, Slide, SlideNumberField, SlideSizePreset, SmartArtFrame, StrikeStyle, Table, TableCell, TableCellProperties, TableFrame, TableProperties, TableRow, Text, TextAlignment, TextBody, TextCapitalization, TileFlipMode, Transform2D, Transition, UnderlineStyle, VerticalAlignment, VideoFrame, buildFill, convertOutput, createBevel, createBottomBevel, createColorElement, createColorTransforms, createEffectList, createGradientFill, createGradientStop, createOutline, createOutlineCompat, createScene3D, createShape3D, createTransformation, emusToInches, emusToPixels, emusToPoints, extractBlipFillMedia, hashedId, inchesToEmus, isRaw, parsePptx, percentToTHousandths, pixelsToEmus, pointsToEmus, toSlideChildren, uniqueId, uniqueNumericIdCreator, uniqueUuid };
 
 //# sourceMappingURL=index.mjs.map