@office-open/pptx 0.6.6 → 0.6.8

package/dist/{index.js → index.mjs}

@@ -1,5 +1,5 @@
-import { i as __toCommonJS, n as __exportAll, r as __reExport, t as __esmMin } from "./chunk-DJOrGtkp.js";
-import { AppProperties, BaseXmlComponent, BuilderElement, EmptyElement, Formatter, Formatter as Formatter$1, ImportedXmlComponent, NextAttributeComponent, OoxmlMimeType, PPTX_NS, Relationships, XmlComponent, ZIP_STORED_LEVEL, addSmartArtRelationships, appendContentType, buildCorePropertiesXml, collectPlaceholderKeys, compileMapping, convertEmuToInches, convertEmuToPixels, convertEmuToPixels as convertEmuToPixels$1, convertEmuToPoints, convertInchesToEmu, convertPixelsToEmu, convertPixelsToEmu as convertPixelsToEmu$1, convertPointsToEmu, createPacker, createReplacer, escapeRegex, formatId, getReferencedMedia, hasPlaceholders, hashedId, parseArchive, parseCorePropsElement, replaceChartPlaceholders, replaceImagePlaceholders, replaceSmartArtPlaceholders, strFromU8, stringContainerObj, toJson, uniqueId, uniqueNumericIdCreator, uniqueUuid, unzipSync, xsdLineEndSize, xsdRectAlignment, xsdStrikeStyle, xsdTextAlign, xsdTextAnchor, xsdTextCaps, xsdUnderlineStyle, zipAndConvert } from "@office-open/core";
+import { i as __toCommonJS, n as __exportAll, r as __reExport, t as __esmMin } from "./chunk-090QGkrx.mjs";
+import { AppProperties, BaseXmlComponent, BuilderElement, EmptyElement, Formatter, Formatter as Formatter$1, ImportedXmlComponent, OoxmlMimeType, PPTX_NS, Relationships, XmlComponent, ZIP_STORED_LEVEL, addSmartArtRelationships, appendContentType, buildAttrObject, buildCorePropertiesXmlString, collectPlaceholderKeys, compileMapping, convertEmuToInches, convertEmuToPixels, convertEmuToPixels as convertEmuToPixels$1, convertEmuToPoints, convertInchesToEmu, convertPixelsToEmu, convertPixelsToEmu as convertPixelsToEmu$1, convertPointsToEmu, createPacker, createReplacer, formatId, getReferencedMedia, hasPlaceholders, hashedId, parseArchive, parseCorePropsElement, replaceChartPlaceholders, replaceImagePlaceholders, replaceSmartArtPlaceholders, strFromU8, stringContainerObj, toJson, uniqueId, uniqueNumericIdCreator, uniqueUuid, unzipSync, xsdLineEndSize, xsdRectAlignment, xsdStrikeStyle, xsdTextAlign, xsdTextAnchor, xsdTextCaps, xsdUnderlineStyle, zipAndConvert } from "@office-open/core";
 import { BevelPresetType, CompoundLine, LineCap, LineJoin, PathShadeType, PenAlignment, PresetDash, PresetGeometry, PresetMaterialType, Stretch, TileFlipMode, buildFill, createBevel, createBlip, createBottomBevel, createColorElement, createColorTransforms, createEffectList, createEffectList as createEffectList$1, createGradientFill, createGradientStop, createGroupTransform2D, createOutline, createOutline as createOutline$1, createScene3D, createScene3D as createScene3D$1, createShape3D, createShape3D as createShape3D$1, createTransform2D, extractBlipFillMedia } from "@office-open/core/drawingml";
 import { ChartCollection, ChartSpace } from "@office-open/core/chart";
 import { attr, attrBool, attrNum, children, colorAttr, escapeXml, findChild, findDeep, js2xml, textOf, xml, xml2js } from "@office-open/xml";
@@ -116,7 +116,7 @@ function createPptxEffectList(options) {
 	return effectListOpts ? createEffectList$1(effectListOpts) : null;
 }
 var ReflectionAlignment;
-var init_effects = __esmMin(() => {
+var init_effects = __esmMin((() => {
 	ReflectionAlignment = {
 		TOP_LEFT: "topLeft",
 		TOP: "top",
@@ -128,23 +128,23 @@ var init_effects = __esmMin(() => {
 		BOTTOM: "bottom",
 		BOTTOM_RIGHT: "bottomRight"
 	};
-});
+}));
 //#endregion
 //#region src/file/drawingml/fill.ts
-var init_fill = __esmMin(() => {});
+var init_fill = __esmMin((() => {}));
 //#endregion
 //#region src/file/xml-components/base.ts
-var init_base = __esmMin(() => {});
+var init_base = __esmMin((() => {}));
 //#endregion
 //#region src/file/xml-components/index.ts
-var init_xml_components = __esmMin(() => {
+var init_xml_components = __esmMin((() => {
 	init_base();
-});
+}));
 //#endregion
 //#region src/file/background/background.ts
 var background_exports = /* @__PURE__ */ __exportAll({ Background: () => Background });
 var Background, BackgroundProperties;
-var init_background = __esmMin(() => {
+var init_background = __esmMin((() => {
 	init_effects();
 	init_fill();
 	init_xml_components();
@@ -165,21 +165,17 @@ var init_background = __esmMin(() => {
 				if (el) this.root.push(el);
 			}
 		}
-		prepForXml(context) {
-			const obj = super.prepForXml(context);
-			if (!obj) return void 0;
-			if (this.shadeToTitle && "p:bgPr" in obj) {
-				const children = obj["p:bgPr"];
-				for (const child of children) if ("_attr" in child) {
-					child._attr.shadeToTitle = 1;
-					return obj;
-				}
-				children.unshift({ _attr: { shadeToTitle: 1 } });
+		toXml(context) {
+			if (this.shadeToTitle) {
+				this.root.unshift({ _attr: { shadeToTitle: 1 } });
+				const result = super.toXml(context);
+				this.root.shift();
+				return result;
 			}
-			return obj;
+			return super.toXml(context);
 		}
 	};
-});
+}));
 //#endregion
 //#region src/file/chart/chart-collection.ts
 init_background();
@@ -192,10 +188,7 @@ init_xml_components();
 var CommentAuthorList = class extends XmlComponent {
 	constructor(authors) {
 		super("p:cmAuthorLst");
-		this.root.push(new NextAttributeComponent({ "xmlns:p": {
-			key: "xmlns:p",
-			value: "http://schemas.openxmlformats.org/presentationml/2006/main"
-		} }));
+		this.root.push(buildAttrObject({ "xmlns:p": "http://schemas.openxmlformats.org/presentationml/2006/main" }));
 		for (const author of authors) this.root.push(new BuilderElement({
 			name: "p:cmAuthor",
 			attributes: {
@@ -232,10 +225,7 @@ init_xml_components();
 var SlideCommentList = class extends XmlComponent {
 	constructor(comments) {
 		super("p:cmLst");
-		this.root.push(new NextAttributeComponent({ "xmlns:p": {
-			key: "xmlns:p",
-			value: "http://schemas.openxmlformats.org/presentationml/2006/main"
-		} }));
+		this.root.push(buildAttrObject({ "xmlns:p": "http://schemas.openxmlformats.org/presentationml/2006/main" }));
 		for (const comment of comments) this.root.push(new BuilderElement({
 			name: "p:cm",
 			attributes: {
@@ -283,7 +273,7 @@ const PPTX_NOTES = "application/vnd.openxmlformats-officedocument.presentationml
 const PPTX_COMMENTS = "application/vnd.openxmlformats-officedocument.presentationml.comments+xml";
 const PPTX_COMMENT_AUTHORS = "application/vnd.openxmlformats-officedocument.presentationml.commentAuthors+xml";
 const PPTX_CHART = "application/vnd.openxmlformats-officedocument.drawingml.chart+xml";
-const STATIC_CHILDREN = [{ _attr: { xmlns: "http://schemas.openxmlformats.org/package/2006/content-types" } }, ...[
+const STATIC_ENTRIES = [
 	{
 		type: "Default",
 		contentType: "application/vnd.openxmlformats-package.relationships+xml",
@@ -349,16 +339,12 @@ const STATIC_CHILDREN = [{ _attr: { xmlns: "http://schemas.openxmlformats.org/pa
 		contentType: "application/vnd.openxmlformats-officedocument.presentationml.tableStyles+xml",
 		key: "/ppt/tableStyles.xml"
 	}
-].map((e) => {
-	if (e.type === "Default") return { Default: { _attr: {
-		ContentType: e.contentType,
-		Extension: e.key
-	} } };
-	return { Override: { _attr: {
-		ContentType: e.contentType,
-		PartName: e.key
-	} } };
-})];
+];
+function formatEntry(e) {
+	if (e.type === "Default") return `<Default ContentType="${escapeXml(e.contentType)}" Extension="${escapeXml(e.key)}"/>`;
+	return `<Override ContentType="${escapeXml(e.contentType)}" PartName="${escapeXml(e.key)}"/>`;
+}
+const STATIC_XML = `<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">` + STATIC_ENTRIES.map(formatEntry).join("");
 var ContentTypes = class extends BaseXmlComponent {
 	dynamicEntries = [];
 	constructor() {
@@ -455,17 +441,11 @@ var ContentTypes = class extends BaseXmlComponent {
 			key: `/ppt/theme/theme${index}.xml`
 		});
 	}
-	prepForXml(_context) {
-		const children = [...STATIC_CHILDREN];
-		for (const e of this.dynamicEntries) if (e.type === "Default") children.push({ Default: { _attr: {
-			ContentType: e.contentType,
-			Extension: e.key
-		} } });
-		else children.push({ Override: { _attr: {
-			ContentType: e.contentType,
-			PartName: e.key
-		} } });
-		return { Types: children };
+	toXml(_context) {
+		const parts = [STATIC_XML];
+		for (const e of this.dynamicEntries) parts.push(formatEntry(e));
+		parts.push("</Types>");
+		return parts.join("");
 	}
 };
 //#endregion
@@ -477,8 +457,8 @@ var CoreProperties = class extends BaseXmlComponent {
 		super("cp:coreProperties");
 		this.options = options;
 	}
-	prepForXml(_context) {
-		return buildCorePropertiesXml(this.options);
+	toXml(_context) {
+		return buildCorePropertiesXmlString(this.options);
 	}
 };
 //#endregion
@@ -544,9 +524,6 @@ var GroupTransform2D = class extends XmlComponent {
 		super(`${prefix}:xfrm`);
 		this.core = createGroupTransform2D(options, `${prefix}:xfrm`);
 	}
-	prepForXml(context) {
-		return this.core["prepForXml"]?.(context);
-	}
 	toXml(context) {
 		return this.core.toXml(context);
 	}
@@ -594,32 +571,6 @@ var GroupShapeNonVisualProperties = class extends BuilderElement {
 	}
 };
 //#endregion
-//#region src/file/shape/paragraph/end-paragraph-run.ts
-init_xml_components();
-/**
-* Pure function: builds a:endParaRPr XML object.
-*/
-function buildEndParagraphRunProperties(lang = "en-US") {
-	return { "a:endParaRPr": { _attr: { lang } } };
-}
-/**
-* a:endParaRPr — End paragraph run properties.
-* Lazy: stores lang, builds XML object in prepForXml.
-*/
-var EndParagraphRunProperties = class extends BuilderElement {
-	lang;
-	constructor(lang = "en-US") {
-		super({ name: "a:endParaRPr" });
-		this.lang = lang;
-	}
-	prepForXml(_context) {
-		return buildEndParagraphRunProperties(this.lang);
-	}
-	toXml(_context) {
-		return `<a:endParaRPr lang="${this.lang}"/>`;
-	}
-};
-//#endregion
 //#region src/file/shape/paragraph/paragraph-properties.ts
 init_xml_components();
 const TextAlignment = {
@@ -673,7 +624,7 @@ function buildParagraphProperties(options) {
 }
 /**
 * a:pPr — Paragraph properties (alignment, indent, spacing).
-* Lazy: stores options, builds XML object in prepForXml.
+* Lazy: stores options, builds XML in toXml().
 * Omitted from output when completely empty.
 */
 var ParagraphProperties = class extends XmlComponent {
@@ -682,15 +633,31 @@ var ParagraphProperties = class extends XmlComponent {
 		super("a:pPr");
 		this.options = options;
 	}
-	prepForXml(_context) {
-		return buildParagraphProperties(this.options);
-	}
 	toXml(_context) {
 		const obj = buildParagraphProperties(this.options);
 		return obj ? xml(obj) : "";
 	}
 };
 //#endregion
+//#region src/file/constants.ts
+/**
+* OOXML magic-number constants for PPTX generation.
+*
+* Values are in EMU (English Metric Units) or hundredths of a point,
+* as defined by the OOXML specification.
+* @module
+*/
+/** Default outline width: 1pt = 12700 EMU */
+const DEFAULT_OUTLINE_WIDTH = 12700;
+/** Default shadow blur radius: ~4pt = 50800 EMU */
+const DEFAULT_SHADOW_BLUR_RADIUS = 50800;
+/** Default shadow distance: ~3pt = 38100 EMU */
+const DEFAULT_SHADOW_DISTANCE = 38100;
+/** Default shadow direction: 270° = 2700000 (60,000ths of a degree) */
+const DEFAULT_SHADOW_DIRECTION = 27e5;
+/** Default shadow alpha: 40% = 40000 (100,000ths of a percent) */
+const DEFAULT_SHADOW_ALPHA = 4e4;
+//#endregion
 //#region src/file/shape/paragraph/run-properties.ts
 init_fill();
 init_xml_components();
@@ -711,81 +678,39 @@ const TextCapitalization = {
 	SMALL: "small"
 };
 /**
-* Pure function: builds a:rPr XML object from options.
-* @param hyperlinkKey - pre-generated key for hyperlink placeholder
-* @param fillObject - pre-built fill IXmlableObject (from buildFill)
+* Builds a:rPr attribute string.
 */
-function buildRunProperties(options, hyperlinkKey, fillObject, effectListObject, outlineObject) {
-	const children = [];
-	const attrs = {};
-	if (options.fontSize) attrs.sz = options.fontSize * 100;
-	if (options.bold !== void 0) attrs.b = options.bold;
-	if (options.italic !== void 0) attrs.i = options.italic;
-	if (options.underline) attrs.u = xsdUnderlineStyle.to(options.underline);
-	if (options.lang) attrs.lang = options.lang;
-	if (options.strike) attrs.strike = xsdStrikeStyle.to(options.strike);
-	if (options.baseline !== void 0) attrs.baseline = options.baseline;
-	if (options.capitalization) attrs.cap = xsdTextCaps.to(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;
-	if (Object.keys(attrs).length > 0) children.push({ _attr: attrs });
-	if (outlineObject) children.push(outlineObject);
-	if (fillObject) children.push(fillObject);
-	if (effectListObject) children.push(effectListObject);
-	if (options.font) {
-		children.push({ "a:latin": { _attr: { typeface: options.font } } });
-		children.push({ "a:ea": { _attr: { typeface: options.font } } });
-	}
-	if (options.hyperlink && hyperlinkKey) {
-		const hlinkAttrs = { "r:id": `{hlink:${hyperlinkKey}}` };
-		if (options.hyperlink.tooltip) hlinkAttrs.tooltip = options.hyperlink.tooltip;
-		children.push({ "a:hlinkClick": { _attr: hlinkAttrs } });
-	}
-	if (options.rightToLeft !== void 0) children.push({ "a:rtl": { _attr: { val: options.rightToLeft ? 1 : 0 } } });
-	if (children.length === 0) return void 0;
-	return { "a:rPr": children.length === 1 && "_attr" in children[0] ? children[0] : children };
+function buildAttrString(options) {
+	const attrs = [];
+	if (options.fontSize) attrs.push(`sz="${options.fontSize * 100}"`);
+	if (options.bold !== void 0) attrs.push(`b="${options.bold ? 1 : 0}"`);
+	if (options.italic !== void 0) attrs.push(`i="${options.italic ? 1 : 0}"`);
+	if (options.underline) attrs.push(`u="${xsdUnderlineStyle.to(options.underline)}"`);
+	if (options.lang) attrs.push(`lang="${options.lang}"`);
+	if (options.strike) attrs.push(`strike="${xsdStrikeStyle.to(options.strike)}"`);
+	if (options.baseline !== void 0) attrs.push(`baseline="${options.baseline}"`);
+	if (options.capitalization) attrs.push(`cap="${xsdTextCaps.to(options.capitalization)}"`);
+	if (options.spacing !== void 0) attrs.push(`spc="${options.spacing}"`);
+	if (options.noProof !== void 0) attrs.push(`noProof="${options.noProof ? 1 : 0}"`);
+	if (options.dirty !== void 0) attrs.push(`dirty="${options.dirty ? 1 : 0}"`);
+	return attrs.join(" ");
+}
+/**
+* Checks if options have any settable properties.
+*/
+function hasRunProperties(options) {
+	return !!(options.fontSize || options.bold !== void 0 || options.italic !== void 0 || options.underline || options.font || options.lang || options.fill || options.hyperlink || options.strike || options.baseline !== void 0 || options.spacing !== void 0 || options.capitalization || options.shadow !== void 0 || options.outline !== void 0 || options.rightToLeft !== void 0 || options.noProof !== void 0 || options.dirty !== void 0);
 }
 /**
 * a:rPr — Run properties (font, size, color, etc.).
-* Lazy: stores options, builds XML object in prepForXml.
 */
 var RunProperties = class extends XmlComponent {
 	options;
-	static hasProperties(options) {
-		return !!(options.fontSize || options.bold !== void 0 || options.italic !== void 0 || options.underline || options.font || options.lang || options.fill || options.hyperlink || options.strike || options.baseline !== void 0 || options.spacing !== void 0 || options.capitalization || options.shadow !== void 0 || options.outline !== void 0 || options.rightToLeft !== void 0 || options.noProof !== void 0 || options.dirty !== void 0);
-	}
+	static hasProperties = hasRunProperties;
 	constructor(options = {}) {
 		super("a:rPr");
 		this.options = options;
 	}
-	prepForXml(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;
-		let outlineObj;
-		if (opts.outline) outlineObj = createOutline$1({
-			width: 12700,
-			type: "solidFill",
-			color: { value: "000000" }
-		}).prepForXml(context) ?? void 0;
-		let effectListObj;
-		if (opts.shadow) effectListObj = createEffectList$1({ outerShadow: {
-			blurRadius: 50800,
-			distance: 38100,
-			direction: 27e5,
-			color: {
-				value: "000000",
-				transforms: { alpha: 4e4 }
-			}
-		} }).prepForXml(context) ?? void 0;
-		return buildRunProperties(opts, hyperlinkKey, fillObj, effectListObj, outlineObj);
-	}
 	toXml(context) {
 		const opts = this.options;
 		let hyperlinkKey;
@@ -793,26 +718,35 @@ var RunProperties = class extends XmlComponent {
 			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;
-		let outlineObj;
-		if (opts.outline) outlineObj = createOutline$1({
-			width: 12700,
+		const parts = [];
+		const attrStr = buildAttrString(opts);
+		if (opts.outline) parts.push(createOutline$1({
+			width: DEFAULT_OUTLINE_WIDTH,
 			type: "solidFill",
 			color: { value: "000000" }
-		}).prepForXml(context) ?? void 0;
-		let effectListObj;
-		if (opts.shadow) effectListObj = createEffectList$1({ outerShadow: {
-			blurRadius: 50800,
-			distance: 38100,
-			direction: 27e5,
+		}).toXml(context));
+		if (opts.fill !== void 0) parts.push(buildFill(opts.fill).toXml(context));
+		if (opts.shadow) parts.push(createEffectList$1({ outerShadow: {
+			blurRadius: DEFAULT_SHADOW_BLUR_RADIUS,
+			distance: DEFAULT_SHADOW_DISTANCE,
+			direction: DEFAULT_SHADOW_DIRECTION,
 			color: {
 				value: "000000",
-				transforms: { alpha: 4e4 }
+				transforms: { alpha: DEFAULT_SHADOW_ALPHA }
 			}
-		} }).prepForXml(context) ?? void 0;
-		const obj = buildRunProperties(opts, hyperlinkKey, fillObj, effectListObj, outlineObj);
-		return obj ? xml(obj) : "";
+		} }).toXml(context));
+		if (opts.font) {
+			parts.push(`<a:latin typeface="${opts.font}"/>`);
+			parts.push(`<a:ea typeface="${opts.font}"/>`);
+		}
+		if (opts.hyperlink && hyperlinkKey) {
+			const tooltip = opts.hyperlink.tooltip ? ` tooltip="${opts.hyperlink.tooltip}"` : "";
+			parts.push(`<a:hlinkClick r:id="{hlink:${hyperlinkKey}}"${tooltip}/>`);
+		}
+		if (opts.rightToLeft !== void 0) parts.push(`<a:rtl val="${opts.rightToLeft ? 1 : 0}"/>`);
+		if (attrStr.length === 0 && parts.length === 0) return "";
+		if (parts.length === 0) return `<a:rPr ${attrStr}/>`;
+		return `<a:rPr ${attrStr}>${parts.join("")}</a:rPr>`;
 	}
 };
 //#endregion
@@ -820,7 +754,6 @@ var RunProperties = class extends XmlComponent {
 init_xml_components();
 /**
 * a:r — A run of text with properties.
-* Lazy: stores options, builds XML object in prepForXml.
 */
 var TextRun = class extends XmlComponent {
 	options;
@@ -828,34 +761,9 @@ var TextRun = class extends XmlComponent {
 		super("a:r");
 		this.options = typeof options === "string" ? { text: options } : options;
 	}
-	prepForXml(context) {
-		const children = [];
-		if (RunProperties.hasProperties(this.options)) {
-			const rPrObj = new RunProperties(this.options).prepForXml(context);
-			if (rPrObj) children.push(rPrObj);
-		}
-		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 };
-	}
-	/**
-	* Fast path: simple properties (no hyperlink/fill/shadow/outline) skip
-	* RunProperties side effects and serialize directly.
-	* Complex path uses RunProperties.toXml() + direct text serialization.
-	*/
 	toXml(context) {
-		const opts = this.options;
-		const hasRPr = RunProperties.hasProperties(opts);
-		if (!hasRPr || !opts.hyperlink && !opts.fill && !opts.shadow && !opts.outline) {
-			let body = "";
-			if (hasRPr) {
-				const rPrObj = buildRunProperties(opts);
-				if (rPrObj) body += xml(rPrObj);
-			}
-			if (opts.text) body += `<a:t>${escapeXml(opts.text)}</a:t>`;
-			return body.length === 0 ? "<a:r/>" : `<a:r>${body}</a:r>`;
-		}
-		let body = new RunProperties(opts).toXml(context);
-		if (opts.text) body += `<a:t>${escapeXml(opts.text)}</a:t>`;
+		const body = new RunProperties(this.options).toXml(context);
+		if (this.options.text) return `<a:r>${body}<a:t>${escapeXml(this.options.text)}</a:t></a:r>`;
 		return body ? `<a:r>${body}</a:r>` : "<a:r/>";
 	}
 };
@@ -864,7 +772,7 @@ var TextRun = class extends XmlComponent {
 init_xml_components();
 /**
 * a:p — A paragraph in a text body.
-* Lazy: stores options, builds XML object in prepForXml.
+* Lazy: stores options, builds XML in toXml().
 */
 var Paragraph = class extends XmlComponent {
 	options;
@@ -872,21 +780,6 @@ var Paragraph = class extends XmlComponent {
 		super("a:p");
 		this.options = typeof options === "string" ? { text: options } : options;
 	}
-	prepForXml(context) {
-		const children = [];
-		const pPr = buildParagraphProperties(this.options.properties ?? {});
-		if (pPr) children.push(pPr);
-		if (this.options.text) {
-			const obj = new TextRun(this.options.text).prepForXml(context);
-			if (obj) children.push(obj);
-		}
-		if (this.options.children) for (const rawChild of this.options.children) {
-			const obj = (rawChild instanceof TextRun || rawChild instanceof XmlComponent ? rawChild : new TextRun(rawChild)).prepForXml(context);
-			if (obj) children.push(obj);
-		}
-		children.push(buildEndParagraphRunProperties());
-		return { "a:p": children };
-	}
 	toXml(context) {
 		const parts = [];
 		const pPr = buildParagraphProperties(this.options.properties ?? {});
@@ -906,16 +799,17 @@ var Paragraph = class extends XmlComponent {
 init_xml_components();
 init_fill();
 function buildBorderLine(name, options) {
-	const attrs = {};
+	const attrs = [];
+	if (options.width !== void 0) attrs.push(`w="${options.width}"`);
 	const children = [];
-	if (options.width !== void 0) attrs.w = options.width;
-	if (options.color) children.push({ "a:solidFill": [{ "a:srgbClr": { _attr: { val: options.color.replace("#", "") } } }] });
-	if (options.dashStyle) children.push({ "a:prstDash": { _attr: { val: options.dashStyle } } });
-	return { [name]: Object.keys(attrs).length > 0 ? [{ _attr: attrs }, ...children] : children };
+	if (options.color) children.push(`<a:solidFill><a:srgbClr val="${options.color.replace("#", "")}"/></a:solidFill>`);
+	if (options.dashStyle) children.push(`<a:prstDash val="${options.dashStyle}"/>`);
+	const attrStr = attrs.length > 0 ? ` ${attrs.join(" ")}` : "";
+	if (children.length === 0) return `<${name}${attrStr}/>`;
+	return `<${name}${attrStr}>${children.join("")}</${name}>`;
 }
 /**
 * a:tcPr — Table cell properties (borders + fill).
-* Lazy: stores options, builds IXmlableObject in prepForXml.
 */
 var TableCellProperties = class extends BaseXmlComponent {
 	options;
@@ -923,25 +817,28 @@ var TableCellProperties = class extends BaseXmlComponent {
 		super("a:tcPr");
 		this.options = options;
 	}
-	prepForXml(context) {
-		const children = [];
+	toXml(context) {
+		const parts = [];
 		const opts = this.options;
-		if (opts?.verticalAlign) children.push({ _attr: { anchor: opts.verticalAlign } });
+		if (opts?.verticalAlign) parts.push(`anchor="${opts.verticalAlign}"`);
 		if (opts?.borders) {
-			if (opts.borders.left) children.push(buildBorderLine("a:lnL", opts.borders.left));
-			if (opts.borders.right) children.push(buildBorderLine("a:lnR", opts.borders.right));
-			if (opts.borders.top) children.push(buildBorderLine("a:lnT", opts.borders.top));
-			if (opts.borders.bottom) children.push(buildBorderLine("a:lnB", opts.borders.bottom));
+			if (opts.borders.left) parts.push(buildBorderLine("a:lnL", opts.borders.left));
+			if (opts.borders.right) parts.push(buildBorderLine("a:lnR", opts.borders.right));
+			if (opts.borders.top) parts.push(buildBorderLine("a:lnT", opts.borders.top));
+			if (opts.borders.bottom) parts.push(buildBorderLine("a:lnB", opts.borders.bottom));
 		}
 		if (opts?.fill !== void 0) {
-			const fillObj = buildFill(opts.fill).prepForXml(context);
-			if (fillObj) children.push(fillObj);
+			const fillComp = buildFill(opts.fill);
+			parts.push(fillComp.toXml(context));
 		}
-		return { "a:tcPr": children.length === 0 ? {} : children.length === 1 && "_attr" in children[0] ? children[0] : children };
-	}
-	toXml(context) {
-		const obj = this.prepForXml(context);
-		return obj ? xml(obj) : "<a:tcPr/>";
+		if (parts.length === 0) return "<a:tcPr/>";
+		if (!parts[0].startsWith("<")) {
+			const attrStr = parts[0];
+			const children = parts.slice(1);
+			if (children.length === 0) return `<a:tcPr ${attrStr}/>`;
+			return `<a:tcPr ${attrStr}>${children.join("")}</a:tcPr>`;
+		}
+		return `<a:tcPr>${parts.join("")}</a:tcPr>`;
 	}
 };
 //#endregion
@@ -954,7 +851,7 @@ const VerticalAlignment = {
 };
 /**
 * a:tc — Table cell with text body and properties.
-* Lazy: stores options, builds IXmlableObject in prepForXml.
+* Lazy: stores options, builds XML string in toXml.
 */
 var TableCell = class extends BaseXmlComponent {
 	options;
@@ -967,36 +864,6 @@ var TableCell = class extends BaseXmlComponent {
 			children: [new TextRun({ text: options.text })]
 		})] : void 0);
 	}
-	prepForXml(context) {
-		const opts = this.options;
-		const children = [];
-		const tcAttrs = {};
-		if (opts.columnSpan !== void 0 && opts.columnSpan > 1) tcAttrs.gridSpan = opts.columnSpan;
-		if (opts.rowSpan !== void 0 && opts.rowSpan > 1) tcAttrs.rowSpan = opts.rowSpan;
-		if (Object.keys(tcAttrs).length > 0) children.push({ _attr: tcAttrs });
-		const txBodyChildren = [];
-		const margins = opts.margins;
-		const bodyPrAttrs = {};
-		if (margins?.top !== void 0) bodyPrAttrs.tIns = margins.top;
-		if (margins?.bottom !== void 0) bodyPrAttrs.bIns = margins.bottom;
-		if (margins?.left !== void 0) bodyPrAttrs.lIns = margins.left;
-		if (margins?.right !== void 0) bodyPrAttrs.rIns = margins.right;
-		txBodyChildren.push({ "a:bodyPr": Object.keys(bodyPrAttrs).length > 0 ? { _attr: bodyPrAttrs } : {} });
-		txBodyChildren.push({ "a:lstStyle": {} });
-		if (this.paragraphs) for (const p of this.paragraphs) {
-			const pObj = p.prepForXml(context);
-			if (pObj) txBodyChildren.push(pObj);
-		}
-		else txBodyChildren.push({ "a:p": [] });
-		children.push({ "a:txBody": txBodyChildren });
-		const tcPrObj = new TableCellProperties({
-			fill: opts.fill,
-			borders: opts.borders,
-			verticalAlign: opts.verticalAlign ? xsdTextAnchor.to(opts.verticalAlign) : void 0
-		}).prepForXml(context);
-		if (tcPrObj) children.push(tcPrObj);
-		return { "a:tc": children };
-	}
 	toXml(context) {
 		const opts = this.options;
 		const parts = [];
@@ -1054,7 +921,7 @@ function buildBodyPr(options) {
 }
 /**
 * p:txBody — Text body within a shape.
-* Lazy: stores options, builds XML object in prepForXml.
+* Lazy: stores options, builds XML in toXml().
 */
 var TextBody = class extends XmlComponent {
 	options;
@@ -1062,23 +929,6 @@ var TextBody = class extends XmlComponent {
 		super("p:txBody");
 		this.options = options;
 	}
-	prepForXml(context) {
-		const children = [];
-		children.push(buildBodyPr(this.options));
-		children.push({ "a:lstStyle": {} });
-		if (this.options.children) for (const p of this.options.children) {
-			const obj = (typeof p === "string" ? new Paragraph({ children: [new TextRun({ text: p })] }) : p instanceof Paragraph ? p : new Paragraph(p)).prepForXml(context);
-			if (obj) children.push(obj);
-		}
-		else if (this.options.text !== void 0) {
-			const obj = new Paragraph({ children: [new TextRun({ text: this.options.text })] }).prepForXml(context);
-			if (obj) children.push(obj);
-		} else {
-			const obj = new Paragraph().prepForXml(context);
-			if (obj) children.push(obj);
-		}
-		return { "p:txBody": children };
-	}
 	toXml(context) {
 		const parts = [];
 		parts.push(xml(buildBodyPr(this.options)));
@@ -1103,19 +953,10 @@ init_xml_components();
 var NotesSlide = class extends XmlComponent {
 	constructor(options = {}) {
 		super("p:notes");
-		this.root.push(new NextAttributeComponent({
-			"xmlns:a": {
-				key: "xmlns:a",
-				value: "http://schemas.openxmlformats.org/drawingml/2006/main"
-			},
-			"xmlns:r": {
-				key: "xmlns:r",
-				value: "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-			},
-			"xmlns:p": {
-				key: "xmlns:p",
-				value: "http://schemas.openxmlformats.org/presentationml/2006/main"
-			}
+		this.root.push(buildAttrObject({
+			"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"
 		}));
 		this.root.push(new NotesCommonSlideData(options.text));
 		this.root.push(new BuilderElement({
@@ -1297,8 +1138,8 @@ var PresentationProperties = class PresentationProperties extends ImportedXmlCom
 		this.key = showOptions ? presPropsKey(showOptions) : "";
 		if (!PresentationProperties.cache.has(this.key)) PresentationProperties.cache.set(this.key, ImportedXmlComponent.fromXmlString(buildPresPropsXml(showOptions)));
 	}
-	prepForXml() {
-		return PresentationProperties.cache.get(this.key).prepForXml({ stack: [] });
+	toXml(context) {
+		return PresentationProperties.cache.get(this.key).toXml(context);
 	}
 };
 function presPropsKey(o) {
@@ -1337,10 +1178,9 @@ const DEFAULT_TEXT_STYLE_XML = `<p:defaultTextStyle xmlns:a="http://schemas.open
     <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>`;
-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.
+* Lazy: stores options, builds XML in toXml().
 */
 var Presentation = class extends XmlComponent {
 	options;
@@ -1348,38 +1188,6 @@ var Presentation = class extends XmlComponent {
 		super("p:presentation");
 		this.options = options;
 	}
-	prepForXml(_context) {
-		const opts = this.options;
-		const children = [];
-		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 masterIds = Array.from({ length: opts.masterCount }, (_, i) => ({ "p:sldMasterId": { _attr: {
-			id: 2147483648 + i * 12,
-			"r:id": `rId${i + 1}`
-		} } }));
-		children.push({ "p:sldMasterIdLst": masterIds });
-		const slideRidOffset = opts.masterCount + 1;
-		const sldIds = opts.slideIds.map((id, i) => ({ "p:sldId": { _attr: {
-			id,
-			"r:id": `rId${slideRidOffset + i}`
-		} } }));
-		children.push({ "p:sldIdLst": sldIds });
-		const cx = opts.slideWidth ?? 12192e3;
-		const cy = opts.slideHeight ?? 6858e3;
-		children.push({ "p:sldSz": { _attr: {
-			cx,
-			cy
-		} } });
-		children.push({ "p:notesSz": { _attr: {
-			cx: 6858e3,
-			cy: 9144e3
-		} } });
-		children.push(DEFAULT_TEXT_STYLE_OBJ);
-		return { "p:presentation": children };
-	}
 	toXml(_context) {
 		const opts = this.options;
 		const cx = opts.slideWidth ?? 12192e3;
@@ -1425,9 +1233,6 @@ var Transform2D = class extends XmlComponent {
 		super(`${prefix}:xfrm`);
 		this.core = createTransform2D(options, `${prefix}:xfrm`);
 	}
-	prepForXml(context) {
-		return this.core["prepForXml"]?.(context);
-	}
 	toXml(context) {
 		return this.core.toXml(context);
 	}
@@ -1495,10 +1300,6 @@ var Chart = class extends XmlComponent {
 			key: this.chartKey
 		});
 	}
-	prepForXml(context) {
-		this.registerChart(context);
-		return super.prepForXml(context);
-	}
 	toXml(context) {
 		this.registerChart(context);
 		return super.toXml(context);
@@ -1542,29 +1343,17 @@ var ChartGraphic = class extends XmlComponent {
 var ChartGraphicData = class extends XmlComponent {
 	constructor(chartKey) {
 		super("a:graphicData");
-		this.root.push(new NextAttributeComponent({ uri: {
-			key: "uri",
-			value: "http://schemas.openxmlformats.org/drawingml/2006/chart"
-		} }));
+		this.root.push(buildAttrObject({ uri: "http://schemas.openxmlformats.org/drawingml/2006/chart" }));
 		this.root.push(new ChartRef(chartKey));
 	}
 };
 var ChartRef = class extends XmlComponent {
 	constructor(chartKey) {
 		super("c:chart");
-		this.root.push(new NextAttributeComponent({
-			xmlnsC: {
-				key: "xmlns:c",
-				value: "http://schemas.openxmlformats.org/drawingml/2006/chart"
-			},
-			xmlnsR: {
-				key: "xmlns:r",
-				value: "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-			},
-			rId: {
-				key: "r:id",
-				value: `{chart:${chartKey}}`
-			}
+		this.root.push(buildAttrObject({
+			"xmlns:c": "http://schemas.openxmlformats.org/drawingml/2006/chart",
+			"xmlns:r": "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
+			"r:id": `{chart:${chartKey}}`
 		}));
 	}
 };
@@ -1601,7 +1390,7 @@ function buildMediaData(type, fileName, width, height, data) {
 *
 * Encapsulates the common structure: ID assignment, media data building,
 * p:spPr (Transform2D + PresetGeometry), p:blipFill, p:nvPicPr parts,
-* and media registration in prepForXml.
+* and media registration in toXml().
 */
 var MediaFrameBase = class extends XmlComponent {
 	shapeId;
@@ -1708,10 +1497,6 @@ var MediaFrameBase = class extends XmlComponent {
 		if (this.posterData) file?.media.addImage(this.posterData.fileName, this.posterData);
 		file?.media.addMedia(this.mediaData.fileName, this.mediaData);
 	}
-	prepForXml(context) {
-		this.registerMedia(context);
-		return super.prepForXml(context);
-	}
 	toXml(context) {
 		this.registerMedia(context);
 		return super.toXml(context);
@@ -1906,7 +1691,7 @@ init_xml_components();
 /**
 * p:pic — A picture on a slide.
 *
-* Registers image with Media collection via prepForXml/toXml.
+* Registers image with Media collection via toXml().
 * The ImageReplacer replaces `{fileName}` placeholder with actual rId.
 */
 var Picture = class Picture extends XmlComponent {
@@ -1943,10 +1728,6 @@ var Picture = class Picture extends XmlComponent {
 	registerMedia(context) {
 		context.fileData?.media.addImage(this.imageData.fileName, this.imageData);
 	}
-	prepForXml(context) {
-		this.registerMedia(context);
-		return super.prepForXml(context);
-	}
 	toXml(context) {
 		this.registerMedia(context);
 		return super.toXml(context);
@@ -1957,7 +1738,7 @@ var Picture = class Picture extends XmlComponent {
 init_xml_components();
 /**
 * p:grpSp — Group shape containing child shapes.
-* Lazy: stores options, builds XML object in prepForXml.
+* Lazy: stores options, builds XML in toXml().
 */
 var GroupShape = class GroupShape extends BaseXmlComponent {
 	static nextId = 100;
@@ -1968,47 +1749,6 @@ var GroupShape = class GroupShape extends BaseXmlComponent {
 		this.id = GroupShape.nextId++;
 		this.options = options;
 	}
-	prepForXml(context) {
-		const opts = this.options;
-		const id = this.id;
-		const name = `Group ${id}`;
-		const children = [];
-		children.push({ "p:nvGrpSpPr": [
-			{ "p:cNvPr": { _attr: {
-				id,
-				name
-			} } },
-			{ "p:cNvGrpSpPr": {} },
-			{ "p:nvPr": {} }
-		] });
-		const xfrmChildren = [];
-		const xfrmAttrs = {};
-		if (opts.flipHorizontal !== void 0) xfrmAttrs.flipH = opts.flipHorizontal ? 1 : 0;
-		if (opts.rotation !== void 0) xfrmAttrs.rot = opts.rotation;
-		if (Object.keys(xfrmAttrs).length > 0) xfrmChildren.push({ _attr: xfrmAttrs });
-		xfrmChildren.push({ "a:off": { _attr: {
-			x: opts.x !== void 0 ? convertPixelsToEmu$1(opts.x) : 0,
-			y: opts.y !== void 0 ? convertPixelsToEmu$1(opts.y) : 0
-		} } });
-		xfrmChildren.push({ "a:ext": { _attr: {
-			cx: opts.width !== void 0 ? convertPixelsToEmu$1(opts.width) : 0,
-			cy: opts.height !== void 0 ? convertPixelsToEmu$1(opts.height) : 0
-		} } });
-		xfrmChildren.push({ "a:chOff": { _attr: {
-			x: 0,
-			y: 0
-		} } });
-		xfrmChildren.push({ "a:chExt": { _attr: {
-			cx: 0,
-			cy: 0
-		} } });
-		children.push({ "p:grpSpPr": [{ "a:xfrm": xfrmChildren }] });
-		for (const rawChild of opts.children) {
-			const obj = coerceChild(rawChild).prepForXml(context);
-			if (obj) children.push(obj);
-		}
-		return { "p:grpSp": children };
-	}
 	toXml(context) {
 		const opts = this.options;
 		const id = this.id;
@@ -2278,7 +2018,6 @@ init_effects();
 init_fill();
 /**
 * p:spPr — Shape properties (transform, geometry, fill, outline, effects).
-* Lazy: stores options, builds XML object directly in prepForXml.
 */
 var ShapeProperties = class extends BaseXmlComponent {
 	options;
@@ -2286,15 +2025,11 @@ var ShapeProperties = class extends BaseXmlComponent {
 		super("p:spPr");
 		this.options = options;
 	}
-	prepForXml(context) {
+	toXml(context) {
 		const opts = this.options;
-		const children = [];
-		if (opts.x !== void 0 || opts.y !== void 0 || opts.width !== void 0 || opts.height !== void 0 || opts.flipHorizontal !== void 0 || opts.rotation !== void 0) {
-			const xfrmObj = new Transform2D(opts).prepForXml(context);
-			if (xfrmObj) children.push(xfrmObj);
-		}
-		const geomObj = new PresetGeometry({ preset: opts.geometry ?? "rect" }).prepForXml(context);
-		if (geomObj) children.push(geomObj);
+		const parts = [];
+		if (opts.x !== void 0 || opts.y !== void 0 || opts.width !== void 0 || opts.height !== void 0 || opts.flipHorizontal !== void 0 || opts.rotation !== void 0) parts.push(new Transform2D(opts).toXml(context));
+		parts.push(new PresetGeometry({ preset: opts.geometry ?? "rect" }).toXml(context));
 		const media = opts.fill ? extractBlipFillMedia(opts.fill) : void 0;
 		if (media) context.fileData?.media.addImage(media.fileName, {
 			data: media.data,
@@ -2311,59 +2046,34 @@ var ShapeProperties = class extends BaseXmlComponent {
 				}
 			}
 		});
-		const fillObj = buildFill(opts.fill !== void 0 ? opts.fill : { type: "none" }).prepForXml(context);
-		if (fillObj) children.push(fillObj);
-		if (opts.outline) {
-			const outlineObj = createOutlineCompat(opts.outline).prepForXml(context);
-			if (outlineObj) children.push(outlineObj);
-		}
+		const fillComponent = buildFill(opts.fill !== void 0 ? opts.fill : { type: "none" });
+		parts.push(fillComponent.toXml(context));
+		if (opts.outline) parts.push(createOutlineCompat(opts.outline).toXml(context));
 		if (opts.effects) {
 			const effectObj = createPptxEffectList(opts.effects);
-			if (effectObj) {
-				const effectXmlObj = effectObj.prepForXml(context);
-				if (effectXmlObj) children.push(effectXmlObj);
-			}
+			if (effectObj) parts.push(effectObj.toXml(context));
 			const scene3d = buildScene3D(opts.effects);
-			if (scene3d) {
-				const sceneObj = scene3d.prepForXml(context);
-				if (sceneObj) children.push(sceneObj);
-			}
+			if (scene3d) parts.push(scene3d.toXml(context));
 			const shape3d = buildShape3D(opts.effects);
-			if (shape3d) {
-				const shapeObj = shape3d.prepForXml(context);
-				if (shapeObj) children.push(shapeObj);
-			}
+			if (shape3d) parts.push(shape3d.toXml(context));
 		}
 		if (opts.connectionSites && opts.connectionSites.length > 0) {
-			const cxnChildren = [];
+			const cxnParts = [];
 			for (const site of opts.connectionSites) {
-				const siteAttrs = { pos: `${site.x} ${site.y}` };
-				if (site.angle !== void 0) siteAttrs.ang = site.angle;
-				cxnChildren.push({ "a:cxn": { _attr: siteAttrs } });
+				const ang = site.angle !== void 0 ? ` ang="${site.angle}"` : "";
+				cxnParts.push(`<a:cxn pos="${site.x} ${site.y}"${ang}/>`);
 			}
-			children.push({ "a:cxnLst": cxnChildren });
+			parts.push(`<a:cxnLst>${cxnParts.join("")}</a:cxnLst>`);
 		}
-		return { "p:spPr": children };
-	}
-	toXml(context) {
-		const obj = this.prepForXml(context);
-		return obj ? xml(obj) : "";
+		return `<p:spPr>${parts.join("")}</p:spPr>`;
 	}
 };
 //#endregion
 //#region src/file/shape/shape.ts
 init_xml_components();
 /**
-* Pure function: builds p:ph element for placeholder.
-*/
-function buildPlaceholder(type, index) {
-	const attrs = { type };
-	if (index !== void 0) attrs.idx = index;
-	return { "p:ph": { _attr: attrs } };
-}
-/**
 * p:sp — A shape on a slide.
-* Lazy: stores options, builds XML object in prepForXml.
+* Lazy: stores options, builds XML in toXml().
 *
 * x/y/width/height accept pixel values and are internally converted to EMUs.
 */
@@ -2382,35 +2092,6 @@ var Shape = class Shape extends XmlComponent {
 			id
 		};
 	}
-	prepForXml(context) {
-		const opts = this.options;
-		const id = this.shapeId;
-		const name = opts.name ?? `Shape ${id}`;
-		const children = [];
-		const nvPrChildren = [];
-		if (opts.placeholder) nvPrChildren.push(buildPlaceholder(opts.placeholder, opts.placeholderIndex));
-		children.push({ "p:nvSpPr": [
-			{ "p:cNvPr": { _attr: {
-				id,
-				name
-			} } },
-			{ "p:cNvSpPr": {} },
-			{ "p:nvPr": nvPrChildren.length > 0 ? nvPrChildren : {} }
-		] });
-		const spPrObj = new ShapeProperties({
-			...emuPositionOptional(opts),
-			geometry: opts.geometry,
-			fill: opts.fill,
-			outline: opts.outline,
-			effects: opts.effects,
-			flipHorizontal: opts.flipHorizontal,
-			rotation: opts.rotation
-		}).prepForXml(context);
-		if (spPrObj) children.push(spPrObj);
-		const txBodyObj = new TextBody(opts.textBody ?? {}).prepForXml(context);
-		if (txBodyObj) children.push(txBodyObj);
-		return { "p:sp": children };
-	}
 	toXml(context) {
 		const opts = this.options;
 		const id = this.shapeId;
@@ -2475,10 +2156,6 @@ var SmartArt = class extends XmlComponent {
 			color: this.colorId
 		});
 	}
-	prepForXml(context) {
-		this.registerSmartArt(context);
-		return super.prepForXml(context);
-	}
 	toXml(context) {
 		this.registerSmartArt(context);
 		return super.toXml(context);
@@ -2522,41 +2199,20 @@ var SmartArtGraphic = class extends XmlComponent {
 var SmartArtGraphicData = class extends XmlComponent {
 	constructor(smartArtKey) {
 		super("a:graphicData");
-		this.root.push(new NextAttributeComponent({ uri: {
-			key: "uri",
-			value: "http://schemas.openxmlformats.org/drawingml/2006/diagram"
-		} }));
+		this.root.push(buildAttrObject({ uri: "http://schemas.openxmlformats.org/drawingml/2006/diagram" }));
 		this.root.push(new DiagramRelIds(smartArtKey));
 	}
 };
 var DiagramRelIds = class extends XmlComponent {
 	constructor(smartArtKey) {
 		super("dgm:relIds");
-		this.root.push(new NextAttributeComponent({
-			xmlnsDgm: {
-				key: "xmlns:dgm",
-				value: "http://schemas.openxmlformats.org/drawingml/2006/diagram"
-			},
-			xmlnsR: {
-				key: "xmlns:r",
-				value: "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
-			},
-			rDm: {
-				key: "r:dm",
-				value: `{smartart:${smartArtKey}}`
-			},
-			rLo: {
-				key: "r:lo",
-				value: `{smartart-lo:${smartArtKey}}`
-			},
-			rQs: {
-				key: "r:qs",
-				value: `{smartart-qs:${smartArtKey}}`
-			},
-			rCs: {
-				key: "r:cs",
-				value: `{smartart-cs:${smartArtKey}}`
-			}
+		this.root.push(buildAttrObject({
+			"xmlns:dgm": "http://schemas.openxmlformats.org/drawingml/2006/diagram",
+			"xmlns:r": "http://schemas.openxmlformats.org/officeDocument/2006/relationships",
+			"r:dm": `{smartart:${smartArtKey}}`,
+			"r:lo": `{smartart-lo:${smartArtKey}}`,
+			"r:qs": `{smartart-qs:${smartArtKey}}`,
+			"r:cs": `{smartart-cs:${smartArtKey}}`
 		}));
 	}
 };
@@ -2565,7 +2221,7 @@ var DiagramRelIds = class extends XmlComponent {
 init_xml_components();
 /**
 * a:graphic > a:graphicData — DrawingML graphic wrapper for table.
-* Lazy: stores table reference, builds IXmlableObject in prepForXml.
+* Lazy: stores table reference, builds XML in toXml().
 */
 var Graphic = class extends BaseXmlComponent {
 	table;
@@ -2573,12 +2229,6 @@ var Graphic = class extends BaseXmlComponent {
 		super("a:graphic");
 		this.table = table;
 	}
-	prepForXml(context) {
-		const tableObj = this.table.prepForXml(context);
-		const graphicDataChildren = [{ _attr: { uri: "http://schemas.openxmlformats.org/drawingml/2006/table" } }];
-		if (tableObj) graphicDataChildren.push(tableObj);
-		return { "a:graphic": [{ "a:graphicData": graphicDataChildren }] };
-	}
 	toXml(context) {
 		return `<a:graphic><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/table">${this.table.toXml(context)}</a:graphicData></a:graphic>`;
 	}
@@ -2625,7 +2275,7 @@ var GraphicFrameNonVisual = class GraphicFrameNonVisual extends XmlComponent {
 init_xml_components();
 /**
 * a:tblGrid — Table grid with column width definitions.
-* Lazy: stores widths, builds IXmlableObject in prepForXml.
+* Lazy: stores widths, builds XML in toXml().
 */
 var TableGrid = class extends BaseXmlComponent {
 	columnWidths;
@@ -2633,9 +2283,6 @@ var TableGrid = class extends BaseXmlComponent {
 		super("a:tblGrid");
 		this.columnWidths = columnWidths;
 	}
-	prepForXml(_context) {
-		return { "a:tblGrid": this.columnWidths.map((w) => ({ "a:gridCol": { _attr: { w } } })) };
-	}
 	toXml(_context) {
 		return `<a:tblGrid>${this.columnWidths.map((w) => `<a:gridCol w="${w}"/>`).join("")}</a:tblGrid>`;
 	}
@@ -2645,7 +2292,7 @@ var TableGrid = class extends BaseXmlComponent {
 init_xml_components();
 /**
 * a:tblPr — Table properties (firstRow, bandRow, etc.).
-* Lazy: stores options, builds IXmlableObject in prepForXml.
+* Lazy: stores options, builds XML in toXml().
 */
 var TableProperties = class extends BaseXmlComponent {
 	options;
@@ -2653,18 +2300,6 @@ var TableProperties = class extends BaseXmlComponent {
 		super("a:tblPr");
 		this.options = options;
 	}
-	prepForXml(_context) {
-		if (!this.options) return { "a:tblPr": {} };
-		const attrs = {};
-		const opts = this.options;
-		if (opts.firstRow !== void 0) attrs.firstRow = opts.firstRow ? 1 : 0;
-		if (opts.lastRow !== void 0) attrs.lastRow = opts.lastRow ? 1 : 0;
-		if (opts.bandRow !== void 0) attrs.bandRow = opts.bandRow ? 1 : 0;
-		if (opts.firstCol !== void 0) attrs.firstCol = opts.firstCol ? 1 : 0;
-		if (opts.lastCol !== void 0) attrs.lastCol = opts.lastCol ? 1 : 0;
-		if (opts.bandCol !== void 0) attrs.bandCol = opts.bandCol ? 1 : 0;
-		return { "a:tblPr": Object.keys(attrs).length > 0 ? { _attr: attrs } : {} };
-	}
 	toXml(_context) {
 		if (!this.options) return "<a:tblPr/>";
 		const opts = this.options;
@@ -2683,7 +2318,7 @@ var TableProperties = class extends BaseXmlComponent {
 init_xml_components();
 /**
 * a:tr — Table row containing cells.
-* Lazy: stores options, builds IXmlableObject in prepForXml.
+* Lazy: stores options, builds XML in toXml().
 */
 var TableRow = class extends BaseXmlComponent {
 	options;
@@ -2691,15 +2326,6 @@ var TableRow = class extends BaseXmlComponent {
 		super("a:tr");
 		this.options = options;
 	}
-	prepForXml(context) {
-		const children = [];
-		children.push({ _attr: { h: this.options.height ?? 0 } });
-		for (const cell of this.options.cells) {
-			const obj = new TableCell(cell).prepForXml(context);
-			if (obj) children.push(obj);
-		}
-		return { "a:tr": children };
-	}
 	toXml(context) {
 		const h = this.options.height ?? 0;
 		const parts = [];
@@ -2712,7 +2338,7 @@ var TableRow = class extends BaseXmlComponent {
 init_xml_components();
 /**
 * a:tbl — DrawingML table element.
-* Lazy: stores options, builds IXmlableObject in prepForXml.
+* Lazy: stores options, builds XML in toXml().
 */
 var DrawingTable = class extends BaseXmlComponent {
 	options;
@@ -2720,44 +2346,6 @@ var DrawingTable = class extends BaseXmlComponent {
 		super("a:tbl");
 		this.options = options;
 	}
-	prepForXml(context) {
-		const opts = this.options;
-		const children = [];
-		const tblPrObj = new TableProperties({
-			firstRow: opts.firstRow,
-			lastRow: opts.lastRow,
-			bandRow: opts.bandRow,
-			firstCol: opts.firstCol,
-			lastCol: opts.lastCol,
-			bandCol: opts.bandCol
-		}).prepForXml(context);
-		if (tblPrObj) children.push(tblPrObj);
-		const gridObj = new TableGrid(opts.columnWidths && opts.columnWidths.length > 0 ? [...opts.columnWidths] : Array.from({ length: opts.rows[0]?.cells.length ?? 1 }, () => 0)).prepForXml(context);
-		if (gridObj) children.push(gridObj);
-		const tb = opts.borders;
-		const rowCount = opts.rows.length;
-		for (let ri = 0; ri < rowCount; ri++) {
-			const row = opts.rows[ri];
-			const colCount = row.cells.length;
-			const cells = tb ? row.cells.map((cell, ci) => {
-				const b = { ...cell.borders };
-				if (ri === 0 && tb.top && !b.top) b.top = tb.top;
-				if (ri === rowCount - 1 && tb.bottom && !b.bottom) b.bottom = tb.bottom;
-				if (ci === 0 && tb.left && !b.left) b.left = tb.left;
-				if (ci === colCount - 1 && tb.right && !b.right) b.right = tb.right;
-				return Object.keys(b).length === 0 ? cell : {
-					...cell,
-					borders: b
-				};
-			}) : row.cells;
-			const trObj = new TableRow({
-				...row,
-				cells
-			}).prepForXml(context);
-			if (trObj) children.push(trObj);
-		}
-		return { "a:tbl": children };
-	}
 	toXml(context) {
 		const opts = this.options;
 		const parts = [];
@@ -2770,24 +2358,12 @@ var DrawingTable = class extends BaseXmlComponent {
 			bandCol: opts.bandCol
 		});
 		parts.push(tblPr.toXml(context));
-		const colWidths = opts.columnWidths && opts.columnWidths.length > 0 ? [...opts.columnWidths] : Array.from({ length: opts.rows[0]?.cells.length ?? 1 }, () => 0);
+		const colWidths = opts.columnWidths && opts.columnWidths.length > 0 ? opts.columnWidths : Array.from({ length: opts.rows[0]?.cells.length ?? 1 }, () => 0);
 		parts.push(new TableGrid(colWidths).toXml(context));
-		const tb = opts.borders;
 		const rowCount = opts.rows.length;
 		for (let ri = 0; ri < rowCount; ri++) {
 			const row = opts.rows[ri];
-			const colCount = row.cells.length;
-			const cells = tb ? row.cells.map((cell, ci) => {
-				const b = { ...cell.borders };
-				if (ri === 0 && tb.top && !b.top) b.top = tb.top;
-				if (ri === rowCount - 1 && tb.bottom && !b.bottom) b.bottom = tb.bottom;
-				if (ci === 0 && tb.left && !b.left) b.left = tb.left;
-				if (ci === colCount - 1 && tb.right && !b.right) b.right = tb.right;
-				return Object.keys(b).length === 0 ? cell : {
-					...cell,
-					borders: b
-				};
-			}) : row.cells;
+			const cells = this.distributeBorders(row, ri, rowCount, opts.borders);
 			parts.push(new TableRow({
 				...row,
 				cells
@@ -2795,6 +2371,29 @@ var DrawingTable = class extends BaseXmlComponent {
 		}
 		return `<a:tbl>${parts.join("")}</a:tbl>`;
 	}
+	/** Distribute table-level borders to edge cells only when needed. */
+	distributeBorders(row, ri, rowCount, tb) {
+		if (!tb) return row.cells;
+		const colCount = row.cells.length;
+		return row.cells.map((cell, ci) => {
+			const needTop = ri === 0 && !!tb.top && !cell.borders?.top;
+			const needBottom = ri === rowCount - 1 && !!tb.bottom && !cell.borders?.bottom;
+			const needLeft = ci === 0 && !!tb.left && !cell.borders?.left;
+			const needRight = ci === colCount - 1 && !!tb.right && !cell.borders?.right;
+			if (!needTop && !needBottom && !needLeft && !needRight) return cell;
+			const borders = {
+				...cell.borders,
+				...needTop && { top: tb.top },
+				...needBottom && { bottom: tb.bottom },
+				...needLeft && { left: tb.left },
+				...needRight && { right: tb.right }
+			};
+			return {
+				...cell,
+				borders
+			};
+		});
+	}
 };
 //#endregion
 //#region src/file/table/table-frame.ts
@@ -2990,8 +2589,8 @@ function buildChildrenXml$1(children) {
 	const ctx = { stack: [] };
 	let result = "";
 	for (const child of children) {
-		const obj = coerceMasterChild(child).prepForXml(ctx);
-		if (obj) result += xml(obj);
+		const xmlStr = coerceMasterChild(child).toXml(ctx);
+		if (xmlStr) result += xmlStr;
 	}
 	return result;
 }
@@ -3052,8 +2651,8 @@ var SlideLayout = class SlideLayout extends ImportedXmlComponent {
 			if (!SlideLayout.cache.has(this.cacheKey)) SlideLayout.cache.set(this.cacheKey, ImportedXmlComponent.fromXmlString(buildLayoutXml(layoutType, slideWidth)));
 		}
 	}
-	prepForXml() {
-		return SlideLayout.cache.get(this.cacheKey).prepForXml({ stack: [] });
+	toXml(context) {
+		return SlideLayout.cache.get(this.cacheKey).toXml(context);
 	}
 };
 var DefaultSlideLayout = class extends SlideLayout {
@@ -3119,17 +2718,15 @@ function footerBody(algn, fldType, fldId, fldText) {
 function buildBackgroundXml(bg) {
 	if (!bg) return `<p:bgRef idx="1001"><a:schemeClr val="bg1"/></p:bgRef>`;
 	const { Background } = (init_background(), __toCommonJS(background_exports));
-	const obj = new Background(bg).prepForXml({ stack: [] });
-	if (!obj) return `<p:bgRef idx="1001"><a:schemeClr val="bg1"/></p:bgRef>`;
-	return xml(obj).replace(/^<p:bg[^>]*>/, "").replace(/<\/p:bg>$/, "");
+	return new Background(bg).toXml({ stack: [] }).replace(/^<p:bg[^>]*>/, "").replace(/<\/p:bg>$/, "");
 }
 function buildChildrenXml(children) {
 	if (!children || children.length === 0) return "";
 	const ctx = { stack: [] };
 	let result = "";
 	for (const child of children) {
-		const obj = coerceMasterChild(child).prepForXml(ctx);
-		if (obj) result += xml(obj);
+		const xmlStr = coerceMasterChild(child).toXml(ctx);
+		if (xmlStr) result += xmlStr;
 	}
 	return result;
 }
@@ -3172,8 +2769,8 @@ var DefaultSlideMaster = class DefaultSlideMaster extends ImportedXmlComponent {
 		this.cacheKey = `${layoutCount}:${masterOptions ? JSON.stringify(masterOptions) : ""}:${slideWidth}:${masterIndex}`;
 		if (!DefaultSlideMaster.cache.has(this.cacheKey)) DefaultSlideMaster.cache.set(this.cacheKey, ImportedXmlComponent.fromXmlString(buildSlideMasterXml(layoutCount, headerFooter, masterOptions, slideWidth, masterIndex)));
 	}
-	prepForXml() {
-		return DefaultSlideMaster.cache.get(this.cacheKey).prepForXml({ stack: [] });
+	toXml(context) {
+		return DefaultSlideMaster.cache.get(this.cacheKey).toXml(context);
 	}
 };
 //#endregion
@@ -4258,33 +3855,33 @@ const DIRECTION_MAP = {
 	in: "in"
 };
 function buildTransitionElement(type, direction, orient, thruBlk, spokes) {
-	const attrs = {};
 	const dir = direction ? DIRECTION_MAP[direction] : void 0;
-	if (ORIENT_TYPES.has(type) && dir) attrs.dir = dir;
-	else if (SIDE_DIR_TYPES.has(type) && dir) attrs.dir = dir;
-	else if (EIGHT_DIR_TYPES.has(type) && dir) attrs.dir = dir;
-	else if (type === "strips" && dir) attrs.dir = dir;
-	else if ((type === "fade" || type === "cut") && thruBlk !== void 0) attrs.thruBlk = thruBlk ? 1 : 0;
-	else if (type === "split") {
-		attrs.orient = orient ?? "horz";
-		attrs.dir = dir ?? "out";
-	} else if (type === "wheel") attrs.spokes = spokes ?? 4;
-	else if (type === "zoom" && dir) attrs.dir = dir;
-	return { [`p:${type}`]: Object.keys(attrs).length > 0 ? { _attr: attrs } : {} };
+	const attrs = [];
+	if (ORIENT_TYPES.has(type) && dir) attrs.push(`dir="${dir}"`);
+	else if (SIDE_DIR_TYPES.has(type) && dir) attrs.push(`dir="${dir}"`);
+	else if (EIGHT_DIR_TYPES.has(type) && dir) attrs.push(`dir="${dir}"`);
+	else if (type === "strips" && dir) attrs.push(`dir="${dir}"`);
+	else if ((type === "fade" || type === "cut") && thruBlk !== void 0) attrs.push(`thruBlk="${thruBlk ? 1 : 0}"`);
+	else if (type === "split") attrs.push(`orient="${orient ?? "horz"}"`, `dir="${dir ?? "out"}"`);
+	else if (type === "wheel") attrs.push(`spokes="${spokes ?? 4}"`);
+	else if (type === "zoom" && dir) attrs.push(`dir="${dir}"`);
+	return attrs.length > 0 ? `<p:${type} ${attrs.join(" ")}/>` : `<p:${type}/>`;
 }
 function buildTransition(options) {
+	const attrParts = [];
+	if (options.speed) attrParts.push(`spd="${options.speed}"`);
+	if (options.advanceOnClick !== void 0) attrParts.push(`advClick="${options.advanceOnClick ? 1 : 0}"`);
+	if (options.advanceAfterTime !== void 0) attrParts.push(`advTm="${options.advanceAfterTime}"`);
 	const children = [];
-	const attrs = {};
-	if (options.speed) attrs.spd = options.speed;
-	if (options.advanceOnClick !== void 0) attrs.advClick = options.advanceOnClick ? 1 : 0;
-	if (options.advanceAfterTime !== void 0) attrs.advTm = options.advanceAfterTime;
-	if (Object.keys(attrs).length > 0) children.push({ _attr: attrs });
 	if (options.type) children.push(buildTransitionElement(options.type, options.direction, options.orient, options.thruBlk, options.spokes));
-	return { "p:transition": children.length === 0 ? {} : children };
+	if (attrParts.length === 0 && children.length === 0) return "<p:transition/>";
+	const attrStr = attrParts.length > 0 ? ` ${attrParts.join(" ")}` : "";
+	if (children.length === 0) return `<p:transition${attrStr}/>`;
+	return `<p:transition${attrStr}>${children.join("")}</p:transition>`;
 }
 /**
 * p:transition — Slide transition effect.
-* Lazy: stores options, builds XML object in prepForXml.
+* Lazy: stores options, builds XML in toXml.
 */
 var Transition = class extends BaseXmlComponent {
 	options;
@@ -4292,7 +3889,7 @@ var Transition = class extends BaseXmlComponent {
 		super("p:transition");
 		this.options = options;
 	}
-	prepForXml(_context) {
+	toXml(_context) {
 		return buildTransition(this.options);
 	}
 };
@@ -4315,7 +3912,7 @@ function collectAnimations(children) {
 }
 /**
 * p:sld — A slide in a presentation.
-* Lazy: stores options, builds XML object in prepForXml.
+* Lazy: stores options, builds XML in toXml().
 */
 var Slide = class extends XmlComponent {
 	children;
@@ -4329,70 +3926,11 @@ var Slide = class extends XmlComponent {
 		this.transition = transition;
 		this.HeaderFooter = headerFooter;
 	}
-	prepForXml(context) {
-		const children = [];
-		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 = [{ "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
-			} } }
-		] }] }];
-		const coercedChildren = this.children.map(coerceChild);
-		for (const child of coercedChildren) {
-			const obj = child.prepForXml(context);
-			if (obj) spTreeChildren.push(obj);
-		}
-		cSldChildren.push({ "p:spTree": spTreeChildren });
-		children.push({ "p:cSld": cSldChildren });
-		children.push({ "p:clrMapOvr": [{ "a:masterClrMapping": {} }] });
-		if (this.transition) {
-			const transObj = buildTransition(this.transition);
-			if (transObj) children.push(transObj);
-		}
-		const animations = collectAnimations(coercedChildren);
-		if (animations.length > 0) {
-			const timingObj = new SlideTiming(animations).prepForXml(context);
-			if (timingObj) children.push(timingObj);
-		}
-		return { "p:sld": children };
-	}
 	toXml(context) {
 		const parts = [];
 		parts.push("<p:sld 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\">");
 		parts.push("<p:cSld>");
-		if (this.background) {
-			const bgObj = this.background.prepForXml(context);
-			if (bgObj) parts.push(xml(bgObj));
-		}
+		if (this.background) parts.push(this.background.toXml(context));
 		parts.push("<p:spTree>");
 		parts.push("<p:nvGrpSpPr><p:cNvPr id=\"1\" name=\"\"/><p:cNvGrpSpPr/><p:nvPr/></p:nvGrpSpPr>");
 		parts.push("<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>");
@@ -4404,14 +3942,11 @@ var Slide = class extends XmlComponent {
 		parts.push("</p:spTree>");
 		parts.push("</p:cSld>");
 		parts.push("<p:clrMapOvr><a:masterClrMapping/></p:clrMapOvr>");
-		if (this.transition) {
-			const transObj = buildTransition(this.transition);
-			if (transObj) parts.push(xml(transObj));
-		}
+		if (this.transition) parts.push(buildTransition(this.transition));
 		const animations = collectAnimations(coercedChildren);
 		if (animations.length > 0) {
-			const timingObj = new SlideTiming(animations).prepForXml(context);
-			if (timingObj) parts.push(xml(timingObj));
+			const timing = new SlideTiming(animations);
+			parts.push(timing.toXml(context));
 		}
 		parts.push("</p:sld>");
 		return parts.join("");
@@ -4426,8 +3961,8 @@ var TableStyles = class TableStyles extends ImportedXmlComponent {
 	constructor() {
 		super("a:tblStyleLst");
 	}
-	prepForXml() {
-		return TableStyles.instance.prepForXml({ stack: [] });
+	toXml(context) {
+		return TableStyles.instance.toXml(context);
 	}
 };
 //#endregion
@@ -4521,9 +4056,6 @@ var DefaultTheme = class DefaultTheme extends ImportedXmlComponent {
 		this.cacheKey = options ? themeKey(options) : "";
 		if (!DefaultTheme.cache.has(this.cacheKey)) DefaultTheme.cache.set(this.cacheKey, ImportedXmlComponent.fromXmlString(buildThemeXml(options)));
 	}
-	prepForXml() {
-		return DefaultTheme.cache.get(this.cacheKey).prepForXml({ stack: [] });
-	}
 	toXml(context) {
 		return DefaultTheme.cache.get(this.cacheKey).toXml(context);
 	}
@@ -4563,8 +4095,8 @@ var ViewProperties = class ViewProperties extends ImportedXmlComponent {
 	constructor() {
 		super("p:viewPr");
 	}
-	prepForXml() {
-		return ViewProperties.instance.prepForXml({ stack: [] });
+	toXml(context) {
+		return ViewProperties.instance.toXml(context);
 	}
 };
 //#endregion
@@ -4925,6 +4457,23 @@ var Text = class extends XmlComponent {
 	}
 };
 //#endregion
+//#region src/file/shape/paragraph/end-paragraph-run.ts
+init_xml_components();
+/**
+* a:endParaRPr — End paragraph run properties.
+* Lazy: stores lang, builds XML in toXml().
+*/
+var EndParagraphRunProperties = class extends BuilderElement {
+	lang;
+	constructor(lang = "en-US") {
+		super({ name: "a:endParaRPr" });
+		this.lang = lang;
+	}
+	toXml(_context) {
+		return `<a:endParaRPr lang="${this.lang}"/>`;
+	}
+};
+//#endregion
 //#region src/file/shape/paragraph/field.ts
 init_xml_components();
 /**
@@ -4935,15 +4484,9 @@ init_xml_components();
 var Field = class extends XmlComponent {
 	constructor(fieldType, displayText) {
 		super("a:fld");
-		this.root.push(new NextAttributeComponent({
-			id: {
-				key: "id",
-				value: `{${crypto.randomUUID()}}`
-			},
-			type: {
-				key: "type",
-				value: fieldType
-			}
+		this.root.push(buildAttrObject({
+			id: `{${crypto.randomUUID()}}`,
+			type: fieldType
 		}));
 		this.root.push(new BuilderElement({
 			name: "a:rPr",
@@ -5047,8 +4590,8 @@ var DefaultNotesMaster = class DefaultNotesMaster extends ImportedXmlComponent {
 	constructor() {
 		super("p:notesMaster");
 	}
-	prepForXml() {
-		return DefaultNotesMaster.instance.prepForXml({ stack: [] });
+	toXml(context) {
+		return DefaultNotesMaster.instance.toXml(context);
 	}
 };
 //#endregion
@@ -5064,23 +4607,11 @@ var HeaderFooter = class extends XmlComponent {
 	constructor(options = {}) {
 		super("p:hf");
 		const attrs = {};
-		if (options.slideNumber !== false) attrs.sldNum = {
-			key: "sldNum",
-			value: 1
-		};
-		if (options.dateTime !== false) attrs.dt = {
-			key: "dt",
-			value: 1
-		};
-		if (options.header === true) attrs.hdr = {
-			key: "hdr",
-			value: 1
-		};
-		if (options.footer !== false && options.footer !== void 0) attrs.ftr = {
-			key: "ftr",
-			value: 1
-		};
-		if (Object.keys(attrs).length > 0) this.root.push(new NextAttributeComponent(attrs));
+		if (options.slideNumber !== false) attrs.sldNum = 1;
+		if (options.dateTime !== false) attrs.dt = 1;
+		if (options.header === true) attrs.hdr = 1;
+		if (options.footer !== false && options.footer !== void 0) attrs.ftr = 1;
+		if (Object.keys(attrs).length > 0) this.root.push(buildAttrObject(attrs));
 		if (typeof options.footer === "string") this.root.push(new BuilderElement({
 			name: "p:ftr",
 			children: [new BuilderElement({
@@ -5116,7 +4647,7 @@ init_background();
 function replaceHyperlinkPlaceholders(xml, hyperlinks, offset) {
 	let result = xml;
 	hyperlinks.forEach((h, i) => {
-		result = result.replace(new RegExp(`\\{hlink:${escapeRegex(h.key)}\\}`, "g"), formatId(offset, i, "rId"));
+		result = result.replaceAll(`{hlink:${h.key}}`, formatId(offset, i, "rId"));
 	});
 	return result;
 }
@@ -5125,27 +4656,33 @@ function replaceHyperlinkPlaceholders(xml, hyperlinks, offset) {
 function replaceMediaPlaceholders(xml, mediaData, offset) {
 	let result = xml;
 	mediaData.forEach((m, i) => {
-		result = result.replace(new RegExp(`\\{media:${escapeRegex(m.fileName)}\\}`, "g"), formatId(offset, i, "rId"));
+		result = result.replaceAll(`{media:${m.fileName}}`, formatId(offset, i, "rId"));
 	});
 	return result;
 }
 function replaceVideoPlaceholders(xml, mediaData, offset) {
 	let result = xml;
 	mediaData.forEach((m, i) => {
-		result = result.replace(new RegExp(`\\{video:${escapeRegex(m.fileName)}\\}`, "g"), formatId(offset, i, "rId"));
+		result = result.replaceAll(`{video:${m.fileName}}`, formatId(offset, i, "rId"));
 	});
 	return result;
 }
 function getMediaRefs(xml, mediaArray) {
-	return collectRefs(xml, "media:", mediaArray);
+	return collectRefs(xml, "{media:", mediaArray);
 }
 function getVideoRefs(xml, mediaArray) {
-	return collectRefs(xml, "video:", mediaArray);
+	return collectRefs(xml, "{video:", mediaArray);
 }
-function collectRefs(xml, prefix, mediaArray) {
-	const pattern = new RegExp(`\\{${escapeRegex(prefix)}([^}]+)\\}`, "g");
+function collectRefs(xml, search, mediaArray) {
 	const keys = /* @__PURE__ */ new Set();
-	for (const match of xml.matchAll(pattern)) keys.add(match[1]);
+	let pos = 0;
+	while ((pos = xml.indexOf(search, pos)) !== -1) {
+		const keyStart = pos + search.length;
+		const keyEnd = xml.indexOf("}", keyStart);
+		if (keyEnd === -1) break;
+		keys.add(xml.substring(keyStart, keyEnd));
+		pos = keyEnd + 1;
+	}
 	return mediaArray.filter((m) => keys.has(m.fileName));
 }
 //#endregion
@@ -5155,18 +4692,17 @@ const encoder$1 = new TextEncoder();
 var Compiler = class {
 	formatter = new Formatter$1();
 	compile(file, overrides = []) {
-		const declaration = true;
 		const context = {
 			fileData: file,
 			stack: []
 		};
 		const mapping = {
 			AppProperties: {
-				data: this.formatter.formatToXml(file.appProperties, context, declaration),
+				data: this.formatter.formatToXml(file.appProperties, context),
 				path: "docProps/app.xml"
 			},
 			Properties: {
-				data: this.formatter.formatToXml(file.coreProperties, context, declaration),
+				data: this.formatter.formatToXml(file.coreProperties, context),
 				path: "docProps/core.xml"
 			},
 			FileRelationships: {
@@ -5176,26 +4712,26 @@ var Compiler = class {
 		};
 		const themes = file.themes;
 		for (let ti = 0; ti < themes.length; ti++) mapping[`Theme${ti}`] = {
-			data: this.formatter.formatToXml(themes[ti], context, declaration),
+			data: this.formatter.formatToXml(themes[ti], context),
 			path: `ppt/theme/theme${ti + 1}.xml`
 		};
 		mapping["TableStyles"] = {
-			data: this.formatter.formatToXml(file.tableStyles, context, declaration),
+			data: this.formatter.formatToXml(file.tableStyles, context),
 			path: "ppt/tableStyles.xml"
 		};
 		mapping["PresProps"] = {
-			data: this.formatter.formatToXml(file.presProps, context, declaration),
+			data: this.formatter.formatToXml(file.presProps, context),
 			path: "ppt/presProps.xml"
 		};
 		mapping["ViewProps"] = {
-			data: this.formatter.formatToXml(file.viewProps, context, declaration),
+			data: this.formatter.formatToXml(file.viewProps, context),
 			path: "ppt/viewProps.xml"
 		};
 		const masters = file.slideMasters;
 		const masterRels = file.slideMasterRelsArray;
 		for (let mi = 0; mi < masters.length; mi++) {
 			mapping[`SlideMaster${mi}`] = {
-				data: this.formatter.formatToXml(masters[mi], context, declaration),
+				data: this.formatter.formatToXml(masters[mi], context),
 				path: `ppt/slideMasters/slideMaster${mi + 1}.xml`
 			};
 			mapping[`SlideMasterRels${mi}`] = {
@@ -5207,7 +4743,7 @@ var Compiler = class {
 		const layoutRels = file.allLayoutRelsArray;
 		for (let li = 0; li < layouts.length; li++) {
 			mapping[`SlideLayout${li}`] = {
-				data: this.formatter.formatToXml(layouts[li].layout, context, declaration),
+				data: this.formatter.formatToXml(layouts[li].layout, context),
 				path: `ppt/slideLayouts/slideLayout${li + 1}.xml`
 			};
 			mapping[`SlideLayoutRels${li}`] = {
@@ -5223,7 +4759,7 @@ var Compiler = class {
 		if (file.notesSlides.length > 0) {
 			file.presentationWrapper.relationships.addRelationship(file.presentationWrapper.relationships.relationshipCount + 1, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesMaster", "notesMasters/notesMaster1.xml");
 			mapping["NotesMaster"] = {
-				data: this.formatter.formatToXml(new DefaultNotesMaster(), context, declaration),
+				data: this.formatter.formatToXml(new DefaultNotesMaster(), context),
 				path: "ppt/notesMasters/notesMaster1.xml"
 			};
 			mapping["NotesMasterRelationships"] = {
@@ -5232,13 +4768,11 @@ var Compiler = class {
 			};
 		}
 		if (file.commentAuthorList) file.presentationWrapper.relationships.addRelationship(file.presentationWrapper.relationships.relationshipCount + 1, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/commentAuthors", "commentAuthors.xml");
-		const presentationXml = this.formatter.formatToXml(file.presentationWrapper.view, context, declaration);
+		const presentationXml = this.formatter.formatToXml(file.presentationWrapper.view, context);
 		let currentImageCount = 0;
 		const mediaData = getReferencedMedia(presentationXml, file.media.array);
 		const presImageOffset = file.presentationWrapper.relationships.relationshipCount + 1;
-		mediaData.forEach((image, idx) => {
-			file.presentationWrapper.relationships.addRelationship(presImageOffset + idx, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image", `../media/${image.fileName}`);
-		});
+		for (let idx = 0; idx < mediaData.length; idx++) file.presentationWrapper.relationships.addRelationship(presImageOffset + idx, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image", `../media/${mediaData[idx].fileName}`);
 		const replacedPresentationXml = replaceImagePlaceholders(presentationXml, mediaData, presImageOffset);
 		currentImageCount += mediaData.length;
 		mapping["Presentation"] = {
@@ -5251,28 +4785,29 @@ var Compiler = class {
 		};
 		for (let i = 0; i < file.slides.length; i++) {
 			const slideWrapper = file.slideWrappers[i];
-			const slideXml = this.formatter.formatToXml(slideWrapper.view, context, declaration);
+			const slideXml = this.formatter.formatToXml(slideWrapper.view, context);
 			const slideMediaData = getReferencedMedia(slideXml, file.media.array);
 			const slideImageOffset = slideWrapper.relationships.relationshipCount + 1;
-			slideMediaData.forEach((image, idx) => {
-				slideWrapper.relationships.addRelationship(slideImageOffset + idx, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image", `../media/${image.fileName}`);
-			});
+			for (let idx = 0; idx < slideMediaData.length; idx++) slideWrapper.relationships.addRelationship(slideImageOffset + idx, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image", `../media/${slideMediaData[idx].fileName}`);
 			let replacedSlideXml = replaceImagePlaceholders(slideXml, slideMediaData, slideImageOffset);
 			currentImageCount += slideMediaData.length;
 			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));
+					const slideChartKeySet = new Set(slideChartKeys);
+					const slideCharts = file.charts.array.filter((c) => slideChartKeySet.has(c.key));
 					replacedSlideXml = replaceChartPlaceholders(replacedSlideXml, slideCharts.map((c) => c.key), slideChartOffset);
-					slideCharts.forEach((chartData, ci) => {
+					for (let ci = 0; ci < slideCharts.length; ci++) {
+						const chartData = slideCharts[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 slideSmartArtKeySet = new Set(slideSmartArtKeys);
+					const slideSmartArts = file.smartArts.array.filter((s) => slideSmartArtKeySet.has(s.key));
 					const saOffset = slideWrapper.relationships.relationshipCount + 1;
 					replacedSlideXml = replaceSmartArtPlaceholders(replacedSlideXml, slideSmartArts.map((s) => s.key), saOffset);
 					const saGlobalStart = file.smartArts.array.indexOf(slideSmartArts[0]);
@@ -5285,12 +4820,11 @@ var Compiler = class {
 				}
 				const slideHlinkKeys = collectPlaceholderKeys(replacedSlideXml, "hlink:");
 				if (slideHlinkKeys.length > 0) {
-					const slideHlinks = file.hyperlinks.array.filter((h) => slideHlinkKeys.includes(h.key));
+					const slideHlinkKeySet = new Set(slideHlinkKeys);
+					const slideHlinks = file.hyperlinks.array.filter((h) => slideHlinkKeySet.has(h.key));
 					const hlinkOffset = slideWrapper.relationships.relationshipCount + 1;
 					replacedSlideXml = replaceHyperlinkPlaceholders(replacedSlideXml, slideHlinks, hlinkOffset);
-					slideHlinks.forEach((hlink, hi) => {
-						slideWrapper.relationships.addRelationship(hlinkOffset + hi, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink", hlink.url, "External");
-					});
+					for (let hi = 0; hi < slideHlinks.length; hi++) slideWrapper.relationships.addRelationship(hlinkOffset + hi, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink", slideHlinks[hi].url, "External");
 				}
 				const slideMediaRefs = getMediaRefs(replacedSlideXml, file.media.array);
 				const slideVideoRefs = getVideoRefs(replacedSlideXml, file.media.array);
@@ -5299,12 +4833,8 @@ var Compiler = class {
 					const videoOffset = mediaOffset + slideMediaRefs.length;
 					replacedSlideXml = replaceMediaPlaceholders(replacedSlideXml, slideMediaRefs, mediaOffset);
 					replacedSlideXml = replaceVideoPlaceholders(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}`);
-					});
+					for (let mi = 0; mi < slideMediaRefs.length; mi++) slideWrapper.relationships.addRelationship(mediaOffset + mi, "http://schemas.microsoft.com/office/2007/relationships/media", `../media/${slideMediaRefs[mi].fileName}`);
+					for (let vi = 0; vi < slideVideoRefs.length; vi++) slideWrapper.relationships.addRelationship(videoOffset + vi, "http://schemas.openxmlformats.org/officeDocument/2006/relationships/video", `../media/${slideVideoRefs[vi].fileName}`);
 				}
 			}
 			mapping[`Slide${i}`] = {
@@ -5319,16 +4849,14 @@ var Compiler = class {
 				path: `ppt/slides/_rels/slide${i + 1}.xml.rels`
 			};
 		}
-		file.charts.array.forEach((_, i) => {
-			file.contentTypes.addChart(i + 1);
-		});
-		file.smartArts.array.forEach((_, i) => {
+		for (let i = 0; i < file.charts.array.length; i++) file.contentTypes.addChart(i + 1);
+		for (let i = 0; i < file.smartArts.array.length; i++) {
 			file.contentTypes.addDiagramData(i + 1);
 			file.contentTypes.addDiagramLayout(i + 1);
 			file.contentTypes.addDiagramStyle(i + 1);
 			file.contentTypes.addDiagramColors(i + 1);
 			file.contentTypes.addDiagramDrawing(i + 1);
-		});
+		}
 		mapping["ContentTypes"] = {
 			data: this.formatter.formatToXml(file.contentTypes, context),
 			path: "[Content_Types].xml"
@@ -5336,7 +4864,7 @@ var Compiler = class {
 		const files = compileMapping(mapping, overrides);
 		for (let i = 0; i < file.charts.array.length; i++) {
 			const chartData = file.charts.array[i];
-			files[`ppt/charts/chart${i + 1}.xml`] = encoder$1.encode(this.formatter.formatToXml(chartData.chartSpace, context, declaration));
+			files[`ppt/charts/chart${i + 1}.xml`] = encoder$1.encode(this.formatter.formatToXml(chartData.chartSpace, context));
 			files[`ppt/charts/_rels/chart${i + 1}.xml.rels`] = encoder$1.encode(xml({ Relationships: { _attr: { xmlns: "http://schemas.openxmlformats.org/package/2006/relationships" } } }, { declaration: {
 				encoding: "UTF-8",
 				standalone: "yes"
@@ -5344,7 +4872,7 @@ var Compiler = class {
 		}
 		for (let i = 0; i < file.smartArts.array.length; i++) {
 			const smartArtData = file.smartArts.array[i];
-			files[`ppt/diagrams/data${i + 1}.xml`] = encoder$1.encode(this.formatter.formatToXml(smartArtData.dataModel, context, declaration));
+			files[`ppt/diagrams/data${i + 1}.xml`] = encoder$1.encode(this.formatter.formatToXml(smartArtData.dataModel, context));
 			files[`ppt/diagrams/layout${i + 1}.xml`] = encoder$1.encode(getLayoutXml(smartArtData.layout));
 			files[`ppt/diagrams/quickStyle${i + 1}.xml`] = encoder$1.encode(getStyleXml(smartArtData.style));
 			files[`ppt/diagrams/colors${i + 1}.xml`] = encoder$1.encode(getColorXml(smartArtData.color));
@@ -5352,15 +4880,15 @@ var Compiler = class {
 		}
 		for (let i = 0; i < file.notesSlides.length; i++) {
 			const notesSlide = file.notesSlides[i];
-			files[`ppt/notesSlides/notesSlide${i + 1}.xml`] = encoder$1.encode(this.formatter.formatToXml(notesSlide, context, declaration));
+			files[`ppt/notesSlides/notesSlide${i + 1}.xml`] = encoder$1.encode(this.formatter.formatToXml(notesSlide, context));
 			files[`ppt/notesSlides/_rels/notesSlide${i + 1}.xml.rels`] = encoder$1.encode(xml({ Relationships: { _attr: { xmlns: "http://schemas.openxmlformats.org/package/2006/relationships" } } }, { declaration: {
 				encoding: "UTF-8",
 				standalone: "yes"
 			} }));
 		}
-		if (file.commentAuthorList) files["ppt/commentAuthors.xml"] = encoder$1.encode(this.formatter.formatToXml(file.commentAuthorList, context, declaration));
+		if (file.commentAuthorList) files["ppt/commentAuthors.xml"] = encoder$1.encode(this.formatter.formatToXml(file.commentAuthorList, context));
 		const commentLists = file.slideCommentLists;
-		for (let i = 0; i < commentLists.length; i++) if (commentLists[i]) files[`ppt/comments/comment${i + 1}.xml`] = encoder$1.encode(this.formatter.formatToXml(commentLists[i], context, declaration));
+		for (let i = 0; i < commentLists.length; i++) if (commentLists[i]) files[`ppt/comments/comment${i + 1}.xml`] = encoder$1.encode(this.formatter.formatToXml(commentLists[i], context));
 		for (const image of file.media.array) {
 			files[`ppt/media/${image.fileName}`] = [image.data, { level: ZIP_STORED_LEVEL }];
 			if (image.type === "svg" && "fallback" in image) {
@@ -7656,4 +7184,4 @@ __reExport(/* @__PURE__ */ __exportAll({
 //#endregion
 export { AppProperties, AudioFrame, Background, BevelPresetType, BlipFill, Chart, ChartCollection, ChartSpace, CompoundLine, ConnectorShape, ContentTypes, CoreProperties, DateTimeField, DefaultNotesMaster, DefaultSlideLayout, DefaultSlideMaster, DefaultTheme, DrawingTable, EndParagraphRunProperties, Field, File, File as Presentation, GroupShape, GroupShapeProperties, GroupTransform2D, HeaderFooter, LineCap, LineJoin, LineShape, Media, NonVisualDrawingProperties, NonVisualPictureProperties, NonVisualShapeProperties, NotesSlide, Packer, Paragraph, ParagraphProperties, PatchType, PathShadeType, PenAlignment, Picture, PresentationWrapper, PresetDash, PresetGeometry, PresetMaterialType, ReflectionAlignment, Relationships, RunProperties, Shape, ShapeProperties, ShapeTree, Slide, SlideLayout, SlideNumberField, SlideSizePreset, SmartArt, StrikeStyle, Table, TableCell, TableCellProperties, TableProperties, TableRow, Text, TextAlignment, TextBody, TextCapitalization, TextRun, TileFlipMode, Transform2D, Transition, UnderlineStyle, VerticalAlignment, VideoFrame, buildFill, coerceChild, convertEmuToInches, convertEmuToPixels, convertEmuToPoints, convertInchesToEmu, convertPixelsToEmu, convertPointsToEmu, createBevel, createBottomBevel, createColorElement, createColorTransforms, createEffectList, createGradientFill, createGradientStop, createOutline, createOutlineCompat, createPptxEffectList, createScene3D, createShape3D, createTransformation, extractBlipFillMedia, hashedId, parseArchive, parsePptx, parsePresentation, patchPresentation, percentToTHousandths, uniqueId, uniqueNumericIdCreator, uniqueUuid };
 
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.mjs.map