@office-open/core 0.9.7 → 0.9.8

package/dist/{src-DlZssiRY.mjs → src-CSka9ln4.mjs}

@@ -1,6 +1,6 @@
 import "./smartart-DCY-Vdv7.mjs";
 import "./chart-DwE8FCFk.mjs";
-import { o as parse, s as stringify$1 } from "./descriptor-DcQm32dg.mjs";
+import { d as parse$1, f as stringify$1 } from "./descriptor-TtMXoZgS.mjs";
 import "./patch-ilNZTQmG.mjs";
 import "./theme-CiNzdl-9.mjs";
 import { attr, attrNum, element, escapeXml, findChild, js2xml, stringify, textOf, xml2js } from "@office-open/xml";
@@ -1616,11 +1616,33 @@ async function nativeZipAsync(files, level = 6) {
 *
 * @module
 */
-function toUint8Array$1(data) {
+const DATA_URL_RE = /^data:([\w.+-]+\/[\w.+-]+)?;base64,/;
+/** Test whether a string is a base64 data URL (`data:[mime];base64,...`). */
+function isBase64DataURL(input) {
+	return DATA_URL_RE.test(input);
+}
+/**
+* Decode a base64 string into a Uint8Array using the most efficient path
+* available: Node `Buffer` (zero-copy) > `Uint8Array.fromBase64()` (2025
+* baseline, no intermediate binary string) > `atob` fallback. Prefer this over
+* raw `atob` for large payloads — `atob` materializes a UCS-2 binary string
+* (~2x memory) before the byte array.
+*/
+function decodeBase64(input) {
+	if (typeof Buffer !== "undefined") return Buffer.from(input, "base64");
+	const fromBase64 = Uint8Array.fromBase64;
+	if (typeof fromBase64 === "function") return fromBase64.call(Uint8Array, input);
+	return Uint8Array.from(atob(input), (c) => c.codePointAt(0));
+}
+function toUint8Array(data) {
 	if (data instanceof Uint8Array) return data;
-	if (data instanceof ArrayBuffer || data instanceof SharedArrayBuffer) return new Uint8Array(data);
+	if (data instanceof ArrayBuffer) return new Uint8Array(data);
 	if (data instanceof DataView) return new Uint8Array(data.buffer, data.byteOffset, data.byteLength);
-	if (typeof data === "string") return new TextEncoder().encode(data);
+	if (typeof data === "string") {
+		const match = data.match(DATA_URL_RE);
+		if (match) return decodeBase64(data.slice(match[0].length));
+		return new TextEncoder().encode(data);
+	}
 	if (Array.isArray(data)) return new Uint8Array(data);
 	if (data instanceof Blob) throw new TypeError("Blob input requires async processing");
 	if (data instanceof ReadableStream) throw new TypeError("ReadableStream input requires async processing");
@@ -1921,6 +1943,824 @@ function parseArchive(data) {
 	return new ParsedArchive(data);
 }
 //#endregion
+//#region src/opc/opc-consistency.ts
+/**
+* OPC (Open Packaging Convention) consistency validator.
+*
+* Pure function operating on an already-unzipped part map. Detects the three
+* classes of cross-part breakage that single-part XSD validation cannot see:
+*
+*   - relationship integrity  — dangling targets, duplicate rIds (O3/O7)
+*   - content-type integrity  — parts with no Override/Default, stale
+*                                Overrides pointing at absent parts (O5/O6)
+*   - structural integrity    — missing `always` parts, undeclared orphans
+*                                (O1/O2)
+*
+* O3/O5/O6/O7 are derived directly from the ZIP + `.rels` + `[Content_Types].xml`
+* and need no registry. O1/O2 consult {@link PackagePartRegistry}.
+*
+* Reference: ECMA-376 Part 2 (OPC).
+*
+* @module
+*/
+function rootElement(xml) {
+	try {
+		return xml2js(xml).elements?.find((e) => e.type === "element");
+	} catch {
+		return;
+	}
+}
+function parseContentTypes(entries) {
+	const defaults = /* @__PURE__ */ new Map();
+	const overrides = /* @__PURE__ */ new Map();
+	const xml = entries.get("[Content_Types].xml");
+	const root = xml ? rootElement(xml) : void 0;
+	if (!root) return {
+		defaults,
+		overrides
+	};
+	for (const child of root.elements ?? []) {
+		if (child.type !== "element") continue;
+		if (child.name === "Default") {
+			const ext = String(child.attributes?.Extension ?? "").toLowerCase();
+			const ct = String(child.attributes?.ContentType ?? "");
+			if (ext && ct) defaults.set(ext, ct);
+		} else if (child.name === "Override") {
+			const partName = normalizePartName(String(child.attributes?.PartName ?? ""));
+			const ct = String(child.attributes?.ContentType ?? "");
+			if (partName && ct) overrides.set(partName, ct);
+		}
+	}
+	return {
+		defaults,
+		overrides
+	};
+}
+function parseAllRels(entries) {
+	const out = [];
+	for (const [relsPath, xml] of entries) {
+		if (!relsPath.endsWith(".rels")) continue;
+		const root = rootElement(xml);
+		if (!root) continue;
+		const list = [];
+		for (const child of root.elements ?? []) {
+			if (child.type !== "element" || child.name !== "Relationship") continue;
+			list.push({
+				id: String(child.attributes?.Id ?? ""),
+				type: String(child.attributes?.Type ?? ""),
+				target: String(child.attributes?.Target ?? ""),
+				targetMode: child.attributes?.TargetMode ? String(child.attributes?.TargetMode) : void 0
+			});
+		}
+		out.push({
+			relsPath,
+			entries: list
+		});
+	}
+	return out;
+}
+/** Strip the leading slash OPC uses on `PartName` to align with ZIP paths. */
+function normalizePartName(partName) {
+	return partName.startsWith("/") ? partName.slice(1) : partName;
+}
+/**
+* Resolve a relationship `Target` (relative to its owning `.rels`) against the
+* ZIP root. Handles the `..` segments slides/masters use to reference siblings.
+*/
+function resolveRelTarget(relsPath, target) {
+	const slash = relsPath.lastIndexOf("/");
+	const relsDir = slash === -1 ? "" : relsPath.slice(0, slash);
+	const base = relsDir === "_rels" ? "" : relsDir.endsWith("/_rels") ? relsDir.slice(0, -6) : relsDir;
+	const segments = (base ? base.split("/") : []).concat(target.split("/"));
+	const resolved = [];
+	for (const seg of segments) {
+		if (seg === "" || seg === ".") continue;
+		if (seg === "..") resolved.pop();
+		else resolved.push(seg);
+	}
+	return resolved.join("/");
+}
+/** Compile a registry path template (with `${i}`) into an anchored matcher. */
+function pathMatcher(template) {
+	const pattern = template.replace(/\$\{i\}/g, "\0").replace(/[.*+?^${}()|[\]\\]/g, "\\$&").replace(//g, "(\\d+)");
+	return new RegExp(`^${pattern}$`);
+}
+function extensionOf(path) {
+	const dot = path.lastIndexOf(".");
+	return dot === -1 ? "" : path.slice(dot + 1).toLowerCase();
+}
+/**
+* Validate OPC consistency of an unzipped package.
+*
+* @param entries  ZIP path → decoded XML/binary text. Binary parts (media,
+*                 fonts) are never parsed here — only their presence matters.
+* @param registry Declarative part expectations for the package format.
+* @returns Issues sorted by code then part. Empty array = consistent.
+*/
+function validateOpcConsistency(entries, registry) {
+	const issues = [];
+	const contentTypes = parseContentTypes(entries);
+	const relsFiles = parseAllRels(entries);
+	for (const def of registry.parts) {
+		if (def.presence.kind !== "always" || def.path.includes("${i}")) continue;
+		if (!entries.has(def.path)) issues.push({
+			code: "O2",
+			severity: "error",
+			part: def.path,
+			message: `required ${registry.format} part is absent from the package`
+		});
+	}
+	const matchers = registry.parts.map((def) => pathMatcher(def.path));
+	for (const path of entries.keys()) {
+		if (path === "[Content_Types].xml") continue;
+		if (path.endsWith(".rels")) continue;
+		if (registry.orphanWhitelist.some((prefix) => path.startsWith(prefix))) continue;
+		if (matchers.some((re) => re.test(path))) continue;
+		issues.push({
+			code: "O1",
+			severity: "warn",
+			part: path,
+			message: `part not declared in the ${registry.format} registry (possible orphan)`
+		});
+	}
+	for (const rf of relsFiles) for (const rel of rf.entries) {
+		if (rel.targetMode === "External") continue;
+		if (/^https?:\/\//i.test(rel.target)) continue;
+		const resolved = resolveRelTarget(rf.relsPath, rel.target);
+		if (!resolved || entries.has(resolved)) continue;
+		issues.push({
+			code: "O3",
+			severity: "error",
+			part: rf.relsPath,
+			message: `relationship ${rel.id || "(no Id)"} (${rel.type}) Target "${rel.target}" resolves to absent part "${resolved}"`
+		});
+	}
+	for (const path of entries.keys()) {
+		if (path === "[Content_Types].xml" || path.endsWith(".rels")) continue;
+		if (contentTypes.overrides.has(path)) continue;
+		const ext = extensionOf(path);
+		if (ext && contentTypes.defaults.has(ext)) continue;
+		issues.push({
+			code: "O5",
+			severity: "error",
+			part: path,
+			message: `part has no [Content_Types] Override and no Default covers extension "${ext || "(none)"}"`
+		});
+	}
+	for (const partName of contentTypes.overrides.keys()) {
+		if (entries.has(partName)) continue;
+		issues.push({
+			code: "O6",
+			severity: "error",
+			part: `/${partName}`,
+			message: `[Content_Types] Override references absent part "${partName}"`
+		});
+	}
+	for (const rf of relsFiles) {
+		const counts = /* @__PURE__ */ new Map();
+		for (const rel of rf.entries) {
+			if (!rel.id) continue;
+			counts.set(rel.id, (counts.get(rel.id) ?? 0) + 1);
+		}
+		for (const [id, count] of counts) {
+			if (count <= 1) continue;
+			issues.push({
+				code: "O7",
+				severity: "warn",
+				part: rf.relsPath,
+				message: `duplicate relationship Id "${id}" appears ${count} times`
+			});
+		}
+	}
+	return issues.sort((a, b) => a.code === b.code ? a.part.localeCompare(b.part) : a.code.localeCompare(b.code));
+}
+function summarizeOpcIssues(issues) {
+	let errors = 0;
+	let warnings = 0;
+	for (const i of issues) if (i.severity === "error") errors++;
+	else warnings++;
+	return {
+		errors,
+		warnings
+	};
+}
+//#endregion
+//#region src/opc/part-registry.ts
+const DOCX_PARTS = {
+	format: "docx",
+	orphanWhitelist: [
+		"word/media/",
+		"word/fonts/",
+		"word/embeddings/",
+		"word/afchunks/",
+		"customXml/",
+		"_rels/",
+		"word/_rels/",
+		"docProps/",
+		"[Content_Types].xml"
+	],
+	parts: [
+		{
+			path: "[Content_Types].xml",
+			presence: { kind: "always" }
+		},
+		{
+			path: "_rels/.rels",
+			presence: { kind: "always" }
+		},
+		{
+			path: "word/document.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml",
+			presence: { kind: "always" }
+		},
+		{
+			path: "word/styles.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml",
+			presence: {
+				kind: "conditional",
+				flag: "freshCompile"
+			}
+		},
+		{
+			path: "word/numbering.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml",
+			presence: {
+				kind: "conditional",
+				flag: "freshCompile"
+			}
+		},
+		{
+			path: "word/footnotes.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.footnotes+xml",
+			presence: {
+				kind: "conditional",
+				flag: "freshCompile"
+			}
+		},
+		{
+			path: "word/endnotes.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.endnotes+xml",
+			presence: {
+				kind: "conditional",
+				flag: "freshCompile"
+			}
+		},
+		{
+			path: "word/settings.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.settings+xml",
+			presence: {
+				kind: "conditional",
+				flag: "freshCompile"
+			}
+		},
+		{
+			path: "word/fontTable.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml",
+			presence: {
+				kind: "conditional",
+				flag: "freshCompile"
+			}
+		},
+		{
+			path: "docProps/core.xml",
+			contentType: "application/vnd.openxmlformats-package.core-properties+xml",
+			presence: {
+				kind: "conditional",
+				flag: "freshCompile"
+			}
+		},
+		{
+			path: "docProps/app.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.extended-properties+xml",
+			presence: {
+				kind: "conditional",
+				flag: "freshCompile"
+			}
+		},
+		{
+			path: "docProps/custom.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.custom-properties+xml",
+			presence: {
+				kind: "conditional",
+				flag: "freshCompile"
+			}
+		},
+		{
+			path: "word/comments.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.comments+xml",
+			presence: {
+				kind: "conditional",
+				flag: "hasComments"
+			}
+		},
+		{
+			path: "word/header${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "headerCount"
+			}
+		},
+		{
+			path: "word/footer${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "footerCount"
+			}
+		},
+		{
+			path: "word/charts/chart${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.drawingml.chart+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "chartCount"
+			}
+		},
+		{
+			path: "word/diagrams/data${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.drawingml.diagramData+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "smartArtCount"
+			}
+		},
+		{
+			path: "word/diagrams/layout${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.drawingml.diagramLayout+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "smartArtCount"
+			}
+		},
+		{
+			path: "word/diagrams/quickStyle${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.drawingml.diagramStyle+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "smartArtCount"
+			}
+		},
+		{
+			path: "word/diagrams/colors${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.drawingml.diagramColors+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "smartArtCount"
+			}
+		},
+		{
+			path: "word/diagrams/drawing${i}.xml",
+			contentType: "application/vnd.ms-office.drawingml.diagramDrawing+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "smartArtCount"
+			}
+		},
+		{
+			path: "word/bibliography.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.bibliography+xml",
+			presence: {
+				kind: "conditional",
+				flag: "hasBibliography"
+			}
+		},
+		{
+			path: "word/glossary/document.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.glossary+xml",
+			presence: {
+				kind: "conditional",
+				flag: "hasGlossary"
+			}
+		},
+		{
+			path: "word/webSettings.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.wordprocessingml.webSettings+xml",
+			presence: {
+				kind: "conditional",
+				flag: "hasWebSettings"
+			}
+		},
+		{
+			path: "word/theme/theme1.xml",
+			presence: {
+				kind: "conditional",
+				flag: "rawParts theme"
+			}
+		}
+	]
+};
+const PPTX_PARTS = {
+	format: "pptx",
+	orphanWhitelist: [
+		"ppt/media/",
+		"ppt/embeddings/",
+		"_rels/",
+		"ppt/_rels/",
+		"ppt/slideMasters/_rels/",
+		"ppt/slideLayouts/_rels/",
+		"ppt/slides/_rels/",
+		"ppt/notesMasters/_rels/",
+		"ppt/notesSlides/_rels/",
+		"ppt/charts/_rels/",
+		"ppt/diagrams/_rels/",
+		"docProps/",
+		"[Content_Types].xml"
+	],
+	parts: [
+		{
+			path: "[Content_Types].xml",
+			presence: { kind: "always" }
+		},
+		{
+			path: "_rels/.rels",
+			presence: { kind: "always" }
+		},
+		{
+			path: "ppt/presentation.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml",
+			presence: { kind: "always" }
+		},
+		{
+			path: "docProps/core.xml",
+			contentType: "application/vnd.openxmlformats-package.core-properties+xml",
+			presence: {
+				kind: "conditional",
+				flag: "freshCompile"
+			}
+		},
+		{
+			path: "docProps/app.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.extended-properties+xml",
+			presence: {
+				kind: "conditional",
+				flag: "freshCompile"
+			}
+		},
+		{
+			path: "ppt/theme/theme${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.theme+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "masters + notes/handout masters"
+			}
+		},
+		{
+			path: "ppt/presProps.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.presentationml.presProps+xml",
+			presence: {
+				kind: "conditional",
+				flag: "freshCompile"
+			}
+		},
+		{
+			path: "ppt/viewProps.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.presentationml.viewProps+xml",
+			presence: {
+				kind: "conditional",
+				flag: "freshCompile"
+			}
+		},
+		{
+			path: "ppt/tableStyles.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.presentationml.tableStyles+xml",
+			presence: {
+				kind: "conditional",
+				flag: "freshCompile"
+			}
+		},
+		{
+			path: "ppt/slideMasters/slideMaster${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.presentationml.slideMaster+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "masters.length"
+			}
+		},
+		{
+			path: "ppt/slideLayouts/slideLayout${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "layouts.length"
+			}
+		},
+		{
+			path: "ppt/slides/slide${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.presentationml.slide+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "slides.length"
+			}
+		},
+		{
+			path: "ppt/notesMasters/notesMaster1.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.presentationml.notesMaster+xml",
+			presence: {
+				kind: "conditional",
+				flag: "any slide has notes"
+			}
+		},
+		{
+			path: "ppt/handoutMasters/handoutMaster1.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.presentationml.handoutMaster+xml",
+			presence: {
+				kind: "conditional",
+				flag: "includeHandoutMaster"
+			}
+		},
+		{
+			path: "ppt/notesSlides/notesSlide${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.presentationml.notesSlide+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "slides with notes"
+			}
+		},
+		{
+			path: "ppt/commentAuthors.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.presentationml.commentAuthors+xml",
+			presence: {
+				kind: "conditional",
+				flag: "any slide has comments"
+			}
+		},
+		{
+			path: "ppt/comments/comment${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.presentationml.comments+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "slides with comments"
+			}
+		},
+		{
+			path: "ppt/charts/chart${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.drawingml.chart+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "charts"
+			}
+		},
+		{
+			path: "ppt/diagrams/data${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.drawingml.diagramData+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "smartArts"
+			}
+		},
+		{
+			path: "ppt/diagrams/layout${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.drawingml.diagramLayout+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "smartArts"
+			}
+		},
+		{
+			path: "ppt/diagrams/quickStyle${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.drawingml.diagramStyle+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "smartArts"
+			}
+		},
+		{
+			path: "ppt/diagrams/colors${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.drawingml.diagramColors+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "smartArts"
+			}
+		},
+		{
+			path: "ppt/diagrams/drawing${i}.xml",
+			contentType: "application/vnd.ms-office.drawingml.diagramDrawing+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "smartArts"
+			}
+		},
+		{
+			path: "ppt/slideSyncPr/slideSyncPr${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.presentationml.slideSyncProperties+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "slides with slideSync"
+			}
+		}
+	]
+};
+const XLSX_PARTS = {
+	format: "xlsx",
+	orphanWhitelist: [
+		"xl/media/",
+		"xl/embeddings/",
+		"_rels/",
+		"xl/_rels/",
+		"xl/worksheets/_rels/",
+		"xl/chartsheets/_rels/",
+		"xl/drawings/_rels/",
+		"xl/pivotTables/_rels/",
+		"xl/pivotCache/_rels/",
+		"xl/externalLinks/_rels/",
+		"docProps/",
+		"[Content_Types].xml"
+	],
+	parts: [
+		{
+			path: "[Content_Types].xml",
+			presence: { kind: "always" }
+		},
+		{
+			path: "_rels/.rels",
+			presence: { kind: "always" }
+		},
+		{
+			path: "xl/workbook.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet.main+xml",
+			presence: { kind: "always" }
+		},
+		{
+			path: "docProps/core.xml",
+			contentType: "application/vnd.openxmlformats-package.core-properties+xml",
+			presence: {
+				kind: "conditional",
+				flag: "freshCompile"
+			}
+		},
+		{
+			path: "docProps/app.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.extended-properties+xml",
+			presence: {
+				kind: "conditional",
+				flag: "freshCompile"
+			}
+		},
+		{
+			path: "xl/styles.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.styles+xml",
+			presence: {
+				kind: "conditional",
+				flag: "freshCompile"
+			}
+		},
+		{
+			path: "xl/theme/theme1.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.theme+xml",
+			presence: {
+				kind: "conditional",
+				flag: "freshCompile"
+			}
+		},
+		{
+			path: "xl/sharedStrings.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.sharedStrings+xml",
+			presence: {
+				kind: "conditional",
+				flag: "sharedStrings.count > 0"
+			}
+		},
+		{
+			path: "xl/worksheets/sheet${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.worksheet+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "worksheets.length"
+			}
+		},
+		{
+			path: "xl/chartsheets/sheet${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.chartsheet+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "chartsheets.length"
+			}
+		},
+		{
+			path: "xl/drawings/drawing${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.drawing+xml",
+			presence: {
+				kind: "conditional",
+				flag: "worksheet has drawing"
+			}
+		},
+		{
+			path: "xl/comments${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.comments+xml",
+			presence: {
+				kind: "conditional",
+				flag: "worksheet.comments.length > 0"
+			}
+		},
+		{
+			path: "xl/drawings/vmlDrawing${i}.vml",
+			presence: {
+				kind: "conditional",
+				flag: "worksheet.comments (legacy VML)"
+			}
+		},
+		{
+			path: "xl/charts/chart${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.drawingml.chart+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "charts"
+			}
+		},
+		{
+			path: "xl/pivotTables/pivotTable${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "pivotTables"
+			}
+		},
+		{
+			path: "xl/pivotCache/pivotCacheDefinition${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheDefinition+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "pivotCaches"
+			}
+		},
+		{
+			path: "xl/pivotCache/pivotCacheRecords${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.pivotCacheRecords+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "pivotCaches"
+			}
+		},
+		{
+			path: "xl/tables/table${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.table+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "tables"
+			}
+		},
+		{
+			path: "xl/externalLinks/externalLink${i}.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.externalLink+xml",
+			presence: {
+				kind: "repeated",
+				countFrom: "externalLinks.length"
+			}
+		},
+		{
+			path: "xl/calcChain.xml",
+			contentType: "application/vnd.openxmlformats-officedocument.spreadsheetml.calcChain+xml",
+			presence: {
+				kind: "conditional",
+				flag: "any formula cell"
+			}
+		}
+	]
+};
+const PART_REGISTRIES = {
+	docx: DOCX_PARTS,
+	pptx: PPTX_PARTS,
+	xlsx: XLSX_PARTS
+};
+//#endregion
+//#region src/opc/content-type-overrides.ts
+/** Ensure a part path carries the leading slash an Override PartName requires. */
+function withLeadingSlash(partPath) {
+	return partPath.startsWith("/") ? partPath : `/${partPath}`;
+}
+/**
+* Derive [Content_Types].xml Override entries for every registry part present
+* under `facts`. The `facts` keys mirror the registry's `flag` / `countFrom`
+* tokens: a boolean for `conditional` parts, a count for `repeated` parts.
+* Order follows `registry.parts`; OPC does not mandate Override order.
+*/
+function buildContentTypeOverrides(registry, facts) {
+	const overrides = [];
+	for (const part of registry.parts) {
+		if (!part.contentType) continue;
+		const presence = part.presence;
+		if (presence.kind === "always") {
+			if (!part.path.includes("${i}")) overrides.push({
+				partName: withLeadingSlash(part.path),
+				contentType: part.contentType
+			});
+		} else if (presence.kind === "conditional") {
+			if (facts.get(presence.flag)) overrides.push({
+				partName: withLeadingSlash(part.path),
+				contentType: part.contentType
+			});
+		} else {
+			const count = Number(facts.get(presence.countFrom) ?? 0);
+			for (let i = 1; i <= count; i++) overrides.push({
+				partName: withLeadingSlash(part.path.replace("${i}", String(i))),
+				contentType: part.contentType
+			});
+		}
+	}
+	return overrides;
+}
+//#endregion
 //#region src/drawingml/color/color-transform.ts
 /**
 * Creates color transform child elements as XML strings.
@@ -3001,7 +3841,7 @@ const createShadeElement = (shade) => {
 	});
 	const pathShade = shade;
 	const children = [];
-	if (pathShade.fillToRect) children.push(createRelativeRect("a:fillToRect", pathShade.fillToRect));
+	if (pathShade.fillToRectangle) children.push(createRelativeRect("a:fillToRect", pathShade.fillToRectangle));
 	return element("a:path", { path: pathShade.path }, children);
 };
 /**
@@ -3035,7 +3875,7 @@ const createGradientFill = (options) => {
 	const stopElements = options.stops.map(createGradientStop);
 	children.push(element("a:gsLst", void 0, stopElements));
 	if (options.shade) children.push(createShadeElement(options.shade));
-	if (options.tileRect) children.push(createRelativeRect("a:tileRect", options.tileRect));
+	if (options.tileRectangle) children.push(createRelativeRect("a:tileRect", options.tileRectangle));
 	return element("a:gradFill", {
 		flip: options.flip,
 		rotWithShape: options.rotateWithShape
@@ -3222,21 +4062,23 @@ const createPatternFill = (options) => {
 function normalizeColor(color) {
 	return typeof color === "string" ? { value: color.replace("#", "") } : color;
 }
-function toUint8Array(data) {
-	return data instanceof Uint8Array ? data : new Uint8Array(data);
-}
 /**
 * Extracts media data from a blip fill option, if present.
 * Returns undefined for non-blip fills.
 *
 * The returned data should be registered with the document's media store
 * during serialization so the packer can resolve the `{fileName}` placeholder.
+*
+* @param fill - Fill options to inspect
+* @param nameAllocator - Optional sequential name provider (e.g. a format
+*   package's media counter). When omitted, falls back to a random id so the
+*   function stays usable from contexts without a shared counter.
 */
-const extractBlipFillMedia = (fill) => {
+const extractBlipFillMedia = (fill, nameAllocator) => {
 	if (typeof fill === "string" || fill.type !== "blip") return void 0;
 	return {
 		data: toUint8Array(fill.data),
-		fileName: `${uniqueId()}.${fill.imageType}`,
+		fileName: nameAllocator ? nameAllocator(fill.imageType) : `${uniqueId()}.${fill.imageType}`,
 		type: fill.imageType
 	};
 };
@@ -3268,7 +4110,7 @@ const buildFill = (options) => {
 			const children = [element("a:blip", {
 				cstate: "none",
 				"r:embed": `{${fileName}}`
-			}, blipChildren.length > 0 ? blipChildren : void 0), createSourceRectangle(options.srcRect)];
+			}, blipChildren.length > 0 ? blipChildren : void 0), createSourceRectangle(options.sourceRectangle)];
 			if (options.tile) children.push(createTileInfo(options.tile));
 			else children.push("<a:stretch><a:fillRect/></a:stretch>");
 			const attrs = {};
@@ -4477,11 +5319,11 @@ function stringifyPresetGeometry(options) {
 const createGuideList = (name, guides) => {
 	return element(name, void 0, guides.map((guide) => `<a:gd name="${guide.name}" fmla="${guide.formula}"/>`));
 };
-const createAdjPoint = (name, point) => element(name, void 0, [`<a:pt x="${point.x}" y="${point.y}"/>`]);
+const createAdjustPoint = (name, point) => element(name, void 0, [`<a:pt x="${point.x}" y="${point.y}"/>`]);
 const createPathCommand = (cmd) => {
 	switch (cmd.command) {
-		case "moveTo": return createAdjPoint("a:moveTo", cmd.point);
-		case "lineTo": return createAdjPoint("a:lnTo", cmd.point);
+		case "moveTo": return createAdjustPoint("a:moveTo", cmd.point);
+		case "lineTo": return createAdjustPoint("a:lnTo", cmd.point);
 		case "arcTo": return `<a:arcTo wR="${cmd.widthRadius}" hR="${cmd.heightRadius}" stAng="${cmd.startAngle}" swAng="${cmd.sweepAngle}"/>`;
 		case "quadBezTo": return element("a:quadBezTo", void 0, cmd.points.map((pt) => `<a:pt x="${pt.x}" y="${pt.y}"/>`));
 		case "cubicBezTo": return element("a:cubicBezTo", void 0, cmd.points.map((pt) => `<a:pt x="${pt.x}" y="${pt.y}"/>`));
@@ -4536,7 +5378,7 @@ const createGeomRect = (rect) => `<a:rect l="${rect.left}" t="${rect.top}" r="${
 *       { command: "close" },
 *     ],
 *   }],
-*   textRect: { left: "2000000", top: "2000000", right: "8000000", bottom: "8000000" },
+*   textRectangle: { left: "2000000", top: "2000000", right: "8000000", bottom: "8000000" },
 * });
 * ```
 */
@@ -4546,7 +5388,7 @@ const createCustomGeometry = (options) => {
 	if (options.guides) children.push(createGuideList("a:gdLst", options.guides));
 	if (options.adjustHandles && options.adjustHandles.length > 0) children.push(element("a:ahLst", void 0, options.adjustHandles.map((h) => h.type === "xy" ? createXYAdjustHandle(h) : createPolarAdjustHandle(h))));
 	if (options.connectionSites && options.connectionSites.length > 0) children.push(element("a:cxnLst", void 0, options.connectionSites.map(createConnectionSite)));
-	if (options.textRect) children.push(createGeomRect(options.textRect));
+	if (options.textRectangle) children.push(createGeomRect(options.textRectangle));
 	children.push(element("a:pathLst", void 0, options.pathList.map(createPath)));
 	return element("a:custGeom", void 0, children);
 };
@@ -4708,7 +5550,7 @@ const createBlip = (options, blipEffects) => {
 const createBlipFill = (blipOptions, fillOptions) => {
 	const children = [];
 	children.push(createBlip(blipOptions, fillOptions?.blipEffects));
-	children.push(createSourceRectangle(fillOptions?.srcRect));
+	children.push(createSourceRectangle(fillOptions?.sourceRectangle));
 	if (fillOptions?.tile) children.push(createTileInfo(fillOptions.tile));
 	else children.push("<a:stretch><a:fillRect/></a:stretch>");
 	const attrs = {};
@@ -5015,10 +5857,10 @@ function createStyleMatrixRef(elementName, opts) {
 }
 /** Create border line element (a:ln with color) or a:lnRef */
 function createThemeableLine(opts) {
-	if (opts.lineRefIdx !== void 0) {
+	if (opts.lineReference !== void 0) {
 		const children = [];
 		if (opts.color) children.push(toStr(opts.color));
-		return element("a:lnRef", { idx: String(opts.lineRefIdx) }, children.length > 0 ? children : void 0);
+		return element("a:lnRef", { idx: String(opts.lineReference.idx) }, children.length > 0 ? children : void 0);
 	}
 	const children = [];
 	if (opts.color) children.push(toStr(opts.color));
@@ -5046,7 +5888,7 @@ function buildCellBorders(opts) {
 }
 function buildTextStyle(opts) {
 	const children = [];
-	if (opts.fontRef) children.push(createStyleMatrixRef("fontRef", opts.fontRef));
+	if (opts.fontReference) children.push(createStyleMatrixRef("fontRef", opts.fontReference));
 	if (opts.color) children.push(toStr(opts.color));
 	const attrs = {};
 	if (opts.bold && opts.bold !== "def") attrs.b = onOffAttr(opts.bold);
@@ -5056,7 +5898,7 @@ function buildTextStyle(opts) {
 function buildCellStyle(opts) {
 	const children = [];
 	if (opts.borders) children.push(buildCellBorders(opts.borders));
-	if (opts.fillRef) children.push(createStyleMatrixRef("fillRef", opts.fillRef));
+	if (opts.fillReference) children.push(createStyleMatrixRef("fillRef", opts.fillReference));
 	else if (opts.fill) children.push(toStr(opts.fill));
 	return element("a:tcStyle", void 0, children);
 }
@@ -5185,7 +6027,7 @@ function parseTableTextStyle(el) {
 	const i = attr(el, "i");
 	if (i === "on" || i === "off") opts.italic = i;
 	const fontRefEl = findChild(el, "a:fontRef");
-	if (fontRefEl) opts.fontRef = parseStyleMatrixRef(fontRefEl);
+	if (fontRefEl) opts.fontReference = parseStyleMatrixRef(fontRefEl);
 	for (const child of el.elements ?? []) {
 		if (child.name === "a:fontRef") continue;
 		opts.color = serializeChild(child);
@@ -5201,7 +6043,7 @@ function parseTableCellStyle(el) {
 		if (borders) opts.borders = borders;
 	}
 	const fillRefEl = findChild(el, "a:fillRef");
-	if (fillRefEl) opts.fillRef = parseStyleMatrixRef(fillRefEl);
+	if (fillRefEl) opts.fillReference = parseStyleMatrixRef(fillRefEl);
 	else for (const child of el.elements ?? []) {
 		if (child.name === "a:tcBdr") continue;
 		opts.fill = serializeChild(child);
@@ -5225,7 +6067,7 @@ function parseThemeableLine(el) {
 	const opts = {};
 	if (el.name === "a:lnRef") {
 		const idx = attrNum(el, "idx");
-		if (idx !== void 0) opts.lineRefIdx = idx;
+		if (idx !== void 0) opts.lineReference = { idx };
 	} else {
 		const w = attrNum(el, "w");
 		if (w !== void 0) opts.width = w;
@@ -5283,25 +6125,25 @@ function createGraphicFrameLocking(opts) {
 * @module
 */
 /** Creates a dgm:adj element. */
-const createAdj = (options) => `<dgm:adj idx="${options.idx}" val="${options.val}"/>`;
-const AnimLevelValue = {
+const createAdjust = (options) => `<dgm:adj idx="${options.idx}" val="${options.val}"/>`;
+const AnimationLevelValue = {
 	NONE: "none",
 	LEVEL: "lvl",
 	CENTER: "ctr"
 };
 /** Creates a dgm:animLvl element. */
-const createAnimLvl = (options) => options?.val !== void 0 ? `<dgm:animLvl val="${options.val}"/>` : "<dgm:animLvl/>";
-const AnimOneValue = {
+const createAnimationLevel = (options) => options?.val !== void 0 ? `<dgm:animLvl val="${options.val}"/>` : "<dgm:animLvl/>";
+const AnimateOneByOneValue = {
 	NONE: "none",
 	ONE: "one",
 	BRANCH: "branch"
 };
 /** Creates a dgm:animOne element. */
-const createAnimOne = (options) => options?.val !== void 0 ? `<dgm:animOne val="${options.val}"/>` : "<dgm:animOne/>";
+const createAnimateOneByOne = (options) => options?.val !== void 0 ? `<dgm:animOne val="${options.val}"/>` : "<dgm:animOne/>";
 /** Creates a dgm:chMax element. */
-const createChMax = (options) => options?.val !== void 0 ? `<dgm:chMax val="${options.val}"/>` : "<dgm:chMax/>";
+const createMaxChildren = (options) => options?.val !== void 0 ? `<dgm:chMax val="${options.val}"/>` : "<dgm:chMax/>";
 /** Creates a dgm:chPref element. */
-const createChPref = (options) => options?.val !== void 0 ? `<dgm:chPref val="${options.val}"/>` : "<dgm:chPref/>";
+const createPreferredChildren = (options) => options?.val !== void 0 ? `<dgm:chPref val="${options.val}"/>` : "<dgm:chPref/>";
 /** Creates a dgm:orgChart element. */
 const createOrgChart = (options) => options?.val !== void 0 ? `<dgm:orgChart val="${options.val}"/>` : "<dgm:orgChart/>";
 const HierBranchStyle = {
@@ -5333,20 +6175,20 @@ const createHierBranch = (options) => options?.val !== void 0 ? `<dgm:hierBranch
 * </xsd:complexType>
 * ```
 */
-const createPresLayoutVars = (options) => {
+const createPresentationLayoutVariables = (options) => {
 	const children = [];
 	if (options?.orgChart) children.push(createOrgChart(options.orgChart));
-	if (options?.chMax) children.push(createChMax(options.chMax));
-	if (options?.chPref) children.push(createChPref(options.chPref));
-	if (options?.animOne) children.push(createAnimOne(options.animOne));
-	if (options?.animLvl) children.push(createAnimLvl(options.animLvl));
+	if (options?.maxChildren) children.push(createMaxChildren(options.maxChildren));
+	if (options?.preferredChildren) children.push(createPreferredChildren(options.preferredChildren));
+	if (options?.animateOneByOne) children.push(createAnimateOneByOne(options.animateOneByOne));
+	if (options?.animationLevel) children.push(createAnimationLevel(options.animationLevel));
 	if (options?.hierBranch) children.push(createHierBranch(options.hierBranch));
 	return element("dgm:presLayoutVars", void 0, children);
 };
 /** Creates a dgm:adjLst element containing dgm:adj children. */
-const createAdjLst = (options) => {
+const createAdjustList = (options) => {
 	const children = [];
-	if (options?.adj) for (const a of options.adj) children.push(createAdj(a));
+	if (options?.adjustments) for (const a of options.adjustments) children.push(createAdjust(a));
 	return element("dgm:adjLst", void 0, children);
 };
 //#endregion
@@ -5394,7 +6236,7 @@ const createCatLst = (categories) => {
 * </xsd:complexType>
 * ```
 */
-const createColorsDefHdr = (options) => {
+const createColorsDefinitionHeader = (options) => {
 	const children = [];
 	for (const t of options.title) children.push(createNameEl("dgm:title", t));
 	for (const d of options.desc) children.push(createDescEl("dgm:desc", d));
@@ -5405,9 +6247,9 @@ const createColorsDefHdr = (options) => {
 	return element("dgm:colorsDefHdr", attrs, children);
 };
 /** Creates a dgm:colorsDefHdrLst element. */
-const createColorsDefHdrLst = (options) => {
+const createColorsDefinitionHeaderList = (options) => {
 	const children = [];
-	if (options?.headers) for (const hdr of options.headers) children.push(createColorsDefHdr(hdr));
+	if (options?.headers) for (const hdr of options.headers) children.push(createColorsDefinitionHeader(hdr));
 	return element("dgm:colorsDefHdrLst", void 0, children);
 };
 /**
@@ -5429,7 +6271,7 @@ const createColorsDefHdrLst = (options) => {
 * </xsd:complexType>
 * ```
 */
-const createLayoutDefHdr = (options) => {
+const createLayoutDefinitionHeader = (options) => {
 	const children = [];
 	for (const t of options.title) children.push(createNameEl("dgm:title", t));
 	for (const d of options.desc) children.push(createDescEl("dgm:desc", d));
@@ -5441,9 +6283,9 @@ const createLayoutDefHdr = (options) => {
 	return element("dgm:layoutDefHdr", attrs, children);
 };
 /** Creates a dgm:layoutDefHdrLst element. */
-const createLayoutDefHdrLst = (options) => {
+const createLayoutDefinitionHeaderList = (options) => {
 	const children = [];
-	if (options?.headers) for (const hdr of options.headers) children.push(createLayoutDefHdr(hdr));
+	if (options?.headers) for (const hdr of options.headers) children.push(createLayoutDefinitionHeader(hdr));
 	return element("dgm:layoutDefHdrLst", void 0, children);
 };
 /**
@@ -5464,7 +6306,7 @@ const createLayoutDefHdrLst = (options) => {
 * </xsd:complexType>
 * ```
 */
-const createStyleDefHdr = (options) => {
+const createStyleDefinitionHeader = (options) => {
 	const children = [];
 	for (const t of options.title) children.push(createNameEl("dgm:title", t));
 	for (const d of options.desc) children.push(createDescEl("dgm:desc", d));
@@ -5475,9 +6317,9 @@ const createStyleDefHdr = (options) => {
 	return element("dgm:styleDefHdr", attrs, children);
 };
 /** Creates a dgm:styleDefHdrLst element. */
-const createStyleDefHdrLst = (options) => {
+const createStyleDefinitionHeaderList = (options) => {
 	const children = [];
-	if (options?.headers) for (const hdr of options.headers) children.push(createStyleDefHdr(hdr));
+	if (options?.headers) for (const hdr of options.headers) children.push(createStyleDefinitionHeader(hdr));
 	return element("dgm:styleDefHdrLst", void 0, children);
 };
 //#endregion
@@ -5517,10 +6359,10 @@ const FontCollectionIndex = {
 */
 const createDiagramStyle = (options) => {
 	const children = [];
-	children.push(element("a:lnRef", { idx: options?.lnIdx ?? 1 }, [createColorElement({ value: SchemeColor.ACCENT1 })]));
-	children.push(element("a:fillRef", { idx: options?.fillIdx ?? 1 }, [createColorElement({ value: SchemeColor.ACCENT1 })]));
-	children.push(element("a:effectRef", { idx: options?.effectIdx ?? 0 }, [createColorElement({ value: SchemeColor.ACCENT1 })]));
-	children.push(element("a:fontRef", { idx: options?.fontIdx ?? "minor" }, [createColorElement({ value: SchemeColor.TX1 })]));
+	children.push(element("a:lnRef", { idx: options?.lineReference?.idx ?? 1 }, [createColorElement({ value: SchemeColor.ACCENT1 })]));
+	children.push(element("a:fillRef", { idx: options?.fillReference?.idx ?? 1 }, [createColorElement({ value: SchemeColor.ACCENT1 })]));
+	children.push(element("a:effectRef", { idx: options?.effectReference?.idx ?? 0 }, [createColorElement({ value: SchemeColor.ACCENT1 })]));
+	children.push(element("a:fontRef", { idx: options?.fontReference?.idx ?? "minor" }, [createColorElement({ value: SchemeColor.TX1 })]));
 	return element("dgm:style", void 0, children);
 };
 const ColorMethod = {
@@ -5542,12 +6384,12 @@ const createColorList = (tag, options) => {
 	if (options?.hueDir) attrs.hueDir = options.hueDir;
 	return element(tag, hasAttrs ? attrs : void 0, children.length > 0 ? children : void 0);
 };
-const createFillClrLst = (options) => createColorList("dgm:fillClrLst", options);
-const createLinClrLst = (options) => createColorList("dgm:linClrLst", options);
-const createEffectClrLst = (options) => createColorList("dgm:effectClrLst", options);
-const createTxFillClrLst = (options) => createColorList("dgm:txFillClrLst", options);
-const createTxLinClrLst = (options) => createColorList("dgm:txLinClrLst", options);
-const createTxEffectClrLst = (options) => createColorList("dgm:txEffectClrLst", options);
+const createFillColorList = (options) => createColorList("dgm:fillClrLst", options);
+const createLineColorList = (options) => createColorList("dgm:linClrLst", options);
+const createEffectColorList = (options) => createColorList("dgm:effectClrLst", options);
+const createTextFillColorList = (options) => createColorList("dgm:txFillClrLst", options);
+const createTextLineColorList = (options) => createColorList("dgm:txLinClrLst", options);
+const createTextEffectColorList = (options) => createColorList("dgm:txEffectClrLst", options);
 /**
 * Creates a dgm:styleLbl element (CT_StyleLabel or CT_CTStyleLabel).
 *
@@ -5581,14 +6423,14 @@ const createTxEffectClrLst = (options) => createColorList("dgm:txEffectClrLst",
 * </xsd:complexType>
 * ```
 */
-const createStyleLbl = (options) => {
+const createStyleLabel = (options) => {
 	const children = [];
-	if (options.fillClrLst) children.push(createFillClrLst(options.fillClrLst));
-	if (options.linClrLst) children.push(createLinClrLst(options.linClrLst));
-	if (options.effectClrLst) children.push(createEffectClrLst(options.effectClrLst));
-	if (options.txFillClrLst) children.push(createTxFillClrLst(options.txFillClrLst));
-	if (options.txLinClrLst) children.push(createTxLinClrLst(options.txLinClrLst));
-	if (options.txEffectClrLst) children.push(createTxEffectClrLst(options.txEffectClrLst));
+	if (options.fillColorList) children.push(createFillColorList(options.fillColorList));
+	if (options.lineColorList) children.push(createLineColorList(options.lineColorList));
+	if (options.effectColorList) children.push(createEffectColorList(options.effectColorList));
+	if (options.textFillColorList) children.push(createTextFillColorList(options.textFillColorList));
+	if (options.textLineColorList) children.push(createTextLineColorList(options.textLineColorList));
+	if (options.textEffectColorList) children.push(createTextEffectColorList(options.textEffectColorList));
 	return element("dgm:styleLbl", { name: options.name }, children);
 };
 //#endregion
@@ -5606,7 +6448,7 @@ const createStyleLbl = (options) => {
 * </xsd:complexType>
 * ```
 */
-const createDiagramRelIds = (options) => `<dgm:relIds r:dm="${options.dm}" r:lo="${options.lo}" r:qs="${options.qs}" r:cs="${options.cs}"/>`;
+const createDiagramRelationshipIds = (options) => `<dgm:relIds r:dm="${options.dm}" r:lo="${options.lo}" r:qs="${options.qs}" r:cs="${options.cs}"/>`;
 //#endregion
 //#region src/drawingml/diagram/diagram-props.ts
 /**
@@ -5621,7 +6463,7 @@ const createDiagramRelIds = (options) => `<dgm:relIds r:dm="${options.dm}" r:lo=
 *
 * Generic extension list pattern used across OOXML.
 */
-const createDiagramExtLst = (options) => {
+const createDiagramExtensionList = (options) => {
 	const children = [];
 	if (options?.extensions) for (const ext of options.extensions) children.push(`<a:ext uri="${ext.uri}"/>`);
 	return element("dgm:extLst", void 0, children);
@@ -5631,7 +6473,7 @@ const createDiagramExtLst = (options) => {
 *
 * Delegates to the shared createShape3D factory but wraps in dgm: namespace context.
 */
-const createDiagramSp3d = (options) => createShape3D(options);
+const createDiagramShape3D = (options) => createShape3D(options);
 /**
 * Creates a dgm:txPr element (CT_TextProps).
 *
@@ -5644,7 +6486,7 @@ const createDiagramSp3d = (options) => createShape3D(options);
 * </xsd:complexType>
 * ```
 */
-const createDiagramTxPr = (_options) => "<dgm:txPr/>";
+const createDiagramTextProperties = (_options) => "<dgm:txPr/>";
 //#endregion
 //#region src/drawingml/color/color-descriptors.ts
 /**
@@ -5713,8 +6555,7 @@ const rgbColorDesc = {
 		return `<a:srgbClr val="${escapeXml(opts.value)}"/>`;
 	},
 	parse(el, _ctx) {
-		const result = {};
-		result.value = String(el.attributes?.["val"] ?? "");
+		const result = { value: String(el.attributes?.["val"] ?? "") };
 		const transforms = readTransforms(el);
 		if (transforms) result.transforms = transforms;
 		return result;
@@ -5728,8 +6569,7 @@ const schemeColorDesc = {
 		return `<a:schemeClr val="${escapeXml(opts.value)}"/>`;
 	},
 	parse(el, _ctx) {
-		const result = {};
-		result.value = String(el.attributes?.["val"] ?? "");
+		const result = { value: String(el.attributes?.["val"] ?? "") };
 		const transforms = readTransforms(el);
 		if (transforms) result.transforms = transforms;
 		return result;
@@ -5743,10 +6583,11 @@ const hslColorDesc = {
 		return `<a:hslClr hue="${opts.hue}" sat="${opts.saturation}" lum="${opts.luminance}"/>`;
 	},
 	parse(el, _ctx) {
-		const result = {};
-		result.hue = Number(el.attributes?.["hue"] ?? 0);
-		result.saturation = Number(el.attributes?.["sat"] ?? 0);
-		result.luminance = Number(el.attributes?.["lum"] ?? 0);
+		const result = {
+			hue: Number(el.attributes?.["hue"] ?? 0),
+			saturation: Number(el.attributes?.["sat"] ?? 0),
+			luminance: Number(el.attributes?.["lum"] ?? 0)
+		};
 		const transforms = readTransforms(el);
 		if (transforms) result.transforms = transforms;
 		return result;
@@ -5763,8 +6604,7 @@ const systemColorDesc = {
 		return `<a:sysClr ${attrStr}/>`;
 	},
 	parse(el, _ctx) {
-		const result = {};
-		result.value = String(el.attributes?.["val"] ?? "");
+		const result = { value: String(el.attributes?.["val"] ?? "") };
 		const lastClr = el.attributes?.["lastClr"];
 		if (lastClr) result.lastClr = String(lastClr);
 		const transforms = readTransforms(el);
@@ -5780,8 +6620,7 @@ const presetColorDesc = {
 		return `<a:prstClr val="${escapeXml(opts.value)}"/>`;
 	},
 	parse(el, _ctx) {
-		const result = {};
-		result.value = String(el.attributes?.["val"] ?? "");
+		const result = { value: String(el.attributes?.["val"] ?? "") };
 		const transforms = readTransforms(el);
 		if (transforms) result.transforms = transforms;
 		return result;
@@ -5795,10 +6634,11 @@ const scRgbColorDesc = {
 		return `<a:scrgbClr r="${escapeXml(opts.r)}" g="${escapeXml(opts.g)}" b="${escapeXml(opts.b)}"/>`;
 	},
 	parse(el, _ctx) {
-		const result = {};
-		result.r = String(el.attributes?.["r"] ?? "");
-		result.g = String(el.attributes?.["g"] ?? "");
-		result.b = String(el.attributes?.["b"] ?? "");
+		const result = {
+			r: String(el.attributes?.["r"] ?? ""),
+			g: String(el.attributes?.["g"] ?? ""),
+			b: String(el.attributes?.["b"] ?? "")
+		};
 		const transforms = readTransforms(el);
 		if (transforms) result.transforms = transforms;
 		return result;
@@ -5879,7 +6719,7 @@ function stringifyShade(shade) {
 	const parts = [];
 	if (pathShade.path) parts.push(`path="${escapeXml(pathShade.path)}"`);
 	const attrStr = parts.length ? " " + parts.join(" ") : "";
-	if (pathShade.fillToRect) return `<a:path${attrStr}>${stringifyRelativeRect("a:fillToRect", pathShade.fillToRect)}</a:path>`;
+	if (pathShade.fillToRectangle) return `<a:path${attrStr}>${stringifyRelativeRect("a:fillToRect", pathShade.fillToRectangle)}</a:path>`;
 	return `<a:path${attrStr}/>`;
 }
 const gradientFillDesc = {
@@ -5893,7 +6733,7 @@ const gradientFillDesc = {
 		}).join("");
 		parts.push(`<a:gsLst>${stopsXml}</a:gsLst>`);
 		if (opts.shade) parts.push(stringifyShade(opts.shade));
-		if (opts.tileRect) parts.push(stringifyRelativeRect("a:tileRect", opts.tileRect));
+		if (opts.tileRectangle) parts.push(stringifyRelativeRect("a:tileRect", opts.tileRectangle));
 		const attrParts = [];
 		if (opts.flip) attrParts.push(`flip="${escapeXml(opts.flip)}"`);
 		if (opts.rotateWithShape !== void 0) attrParts.push(`rotWithShape="${opts.rotateWithShape ? 1 : 0}"`);
@@ -5919,15 +6759,15 @@ const gradientFillDesc = {
 			if (path) {
 				const shade = {};
 				if (path.attributes?.["path"] !== void 0) shade.path = String(path.attributes["path"]);
-				const fillToRect = findChild(path, "a:fillToRect");
-				if (fillToRect) shade.fillToRect = readRelativeRect(fillToRect);
+				const fillToRectangle = findChild(path, "a:fillToRect");
+				if (fillToRectangle) shade.fillToRectangle = readRelativeRect(fillToRectangle);
 				result.shade = shade;
 			}
 		}
 		if (el.attributes?.["flip"] !== void 0) result.flip = String(el.attributes["flip"]);
 		if (el.attributes?.["rotWithShape"] !== void 0) result.rotateWithShape = el.attributes["rotWithShape"] !== "0";
-		const tileRect = findChild(el, "a:tileRect");
-		if (tileRect) result.tileRect = readRelativeRect(tileRect);
+		const tileRectangle = findChild(el, "a:tileRect");
+		if (tileRectangle) result.tileRectangle = readRelativeRect(tileRectangle);
 		return result;
 	}
 };
@@ -5993,17 +6833,17 @@ const fillDesc = {
 		const solidFill = resolve("a:solidFill");
 		if (solidFill) return {
 			type: "solid",
-			color: parse(solidFillDesc, solidFill, ctx)
+			color: parse$1(solidFillDesc, solidFill, ctx)
 		};
 		const gradFill = resolve("a:gradFill");
 		if (gradFill) return {
 			type: "gradient",
-			options: parse(gradientFillDesc, gradFill, ctx)
+			options: parse$1(gradientFillDesc, gradFill, ctx)
 		};
 		const pattFill = resolve("a:pattFill");
 		if (pattFill) return {
 			type: "pattern",
-			...parse(patternFillDesc, pattFill, ctx)
+			...parse$1(patternFillDesc, pattFill, ctx)
 		};
 		if (resolve("a:grpFill")) return { type: "group" };
 		return { type: "none" };
@@ -6013,7 +6853,7 @@ function readDirectColor(el, ctx) {
 	const color = parseColorChoice(el, ctx);
 	if (Object.keys(color).length > 0) return color;
 	const solidFill = findChild(el, "a:solidFill");
-	if (solidFill) return parse(solidFillDesc, solidFill, ctx);
+	if (solidFill) return parse$1(solidFillDesc, solidFill, ctx);
 	return { value: "" };
 }
 //#endregion
@@ -6045,7 +6885,7 @@ const outlineDesc = {
 	stringify(opts, ctx) {
 		const parts = [];
 		const attrParts = [];
-		if (opts.width !== void 0) attrParts.push(`w="${opts.width}"`);
+		if (opts.width !== void 0) attrParts.push(`w="${convertToEmu(opts.width)}"`);
 		if (opts.cap !== void 0) attrParts.push(`cap="${escapeXml(opts.cap)}"`);
 		if (opts.compoundLine !== void 0) attrParts.push(`cmpd="${escapeXml(opts.compoundLine)}"`);
 		if (opts.align !== void 0) attrParts.push(`algn="${escapeXml(opts.align)}"`);
@@ -6079,12 +6919,12 @@ const outlineDesc = {
 		const solidFill = findChild(el, "a:solidFill");
 		if (solidFill) {
 			result.type = "solidFill";
-			result.color = parse(solidFillDesc, solidFill, _ctx);
+			result.color = parse$1(solidFillDesc, solidFill, _ctx);
 		}
 		if (findChild(el, "a:noFill")) result.type = "noFill";
 		if (findChild(el, "a:gradFill")) {
 			result.type = "gradFill";
-			result.gradientFill = parse(gradientFillDesc, findChild(el, "a:gradFill"), _ctx);
+			result.gradientFill = parse$1(gradientFillDesc, findChild(el, "a:gradFill"), _ctx);
 		}
 		const prstDash = findChild(el, "a:prstDash");
 		if (prstDash?.attributes?.["val"]) result.dash = String(prstDash.attributes["val"]);
@@ -6394,22 +7234,22 @@ const presetGeometryDesc = {
 		if (el.attributes?.["prst"] !== void 0) result.preset = String(el.attributes["prst"]);
 		const avLst = findChild(el, "a:avLst");
 		if (avLst) {
-			const guides = parse(adjustmentValuesDesc, avLst, ctx);
+			const guides = parse$1(adjustmentValuesDesc, avLst, ctx);
 			if (guides.length > 0) result.adjustmentValues = guides;
 		}
 		return result;
 	}
 };
-function stringifyAdjPoint(pt) {
+function stringifyAdjustPoint(pt) {
 	return `<a:pt x="${escapeXml(pt.x)}" y="${escapeXml(pt.y)}"/>`;
 }
 function stringifyPathCommand(cmd) {
 	switch (cmd.command) {
-		case "moveTo": return `<a:moveTo>${stringifyAdjPoint(cmd.point)}</a:moveTo>`;
-		case "lineTo": return `<a:lnTo>${stringifyAdjPoint(cmd.point)}</a:lnTo>`;
+		case "moveTo": return `<a:moveTo>${stringifyAdjustPoint(cmd.point)}</a:moveTo>`;
+		case "lineTo": return `<a:lnTo>${stringifyAdjustPoint(cmd.point)}</a:lnTo>`;
 		case "arcTo": return `<a:arcTo wR="${escapeXml(cmd.widthRadius)}" hR="${escapeXml(cmd.heightRadius)}" stAng="${escapeXml(cmd.startAngle)}" swAng="${escapeXml(cmd.sweepAngle)}"/>`;
-		case "quadBezTo": return `<a:quadBezTo>${cmd.points.map(stringifyAdjPoint).join("")}</a:quadBezTo>`;
-		case "cubicBezTo": return `<a:cubicBezTo>${cmd.points.map(stringifyAdjPoint).join("")}</a:cubicBezTo>`;
+		case "quadBezTo": return `<a:quadBezTo>${cmd.points.map(stringifyAdjustPoint).join("")}</a:quadBezTo>`;
+		case "cubicBezTo": return `<a:cubicBezTo>${cmd.points.map(stringifyAdjustPoint).join("")}</a:cubicBezTo>`;
 		case "close": return "<a:close/>";
 	}
 }
@@ -6425,7 +7265,7 @@ function stringifyPath(path) {
 	if (!cmds && !attrStr) return "<a:path/>";
 	return `<a:path${attrStr}>${cmds}</a:path>`;
 }
-function readAdjPoint(el) {
+function readAdjustPoint(el) {
 	if (!el.attributes) return void 0;
 	const x = el.attributes["x"];
 	const y = el.attributes["y"];
@@ -6440,7 +7280,7 @@ function readPathCommand(tag, el) {
 		case "a:moveTo": {
 			const pt = el.elements?.find((c) => c.name === "a:pt");
 			if (!pt) return void 0;
-			const point = readAdjPoint(pt);
+			const point = readAdjustPoint(pt);
 			if (!point) return void 0;
 			return {
 				command: "moveTo",
@@ -6450,7 +7290,7 @@ function readPathCommand(tag, el) {
 		case "a:lnTo": {
 			const pt = el.elements?.find((c) => c.name === "a:pt");
 			if (!pt) return void 0;
-			const point = readAdjPoint(pt);
+			const point = readAdjustPoint(pt);
 			if (!point) return void 0;
 			return {
 				command: "lineTo",
@@ -6469,7 +7309,7 @@ function readPathCommand(tag, el) {
 			};
 		}
 		case "a:quadBezTo": {
-			const points = (el.elements ?? []).filter((c) => c.name === "a:pt").map(readAdjPoint).filter((p) => p !== void 0);
+			const points = (el.elements ?? []).filter((c) => c.name === "a:pt").map(readAdjustPoint).filter((p) => p !== void 0);
 			if (points.length < 2) return void 0;
 			return {
 				command: "quadBezTo",
@@ -6477,7 +7317,7 @@ function readPathCommand(tag, el) {
 			};
 		}
 		case "a:cubicBezTo": {
-			const points = (el.elements ?? []).filter((c) => c.name === "a:pt").map(readAdjPoint).filter((p) => p !== void 0);
+			const points = (el.elements ?? []).filter((c) => c.name === "a:pt").map(readAdjustPoint).filter((p) => p !== void 0);
 			if (points.length < 3) return void 0;
 			return {
 				command: "cubicBezTo",
@@ -6642,7 +7482,7 @@ const customGeometryDesc = {
 			const inner = opts.connectionSites.map(stringifyConnectionSite).join("");
 			parts.push(`<a:cxnLst>${inner}</a:cxnLst>`);
 		}
-		if (opts.textRect) parts.push(stringifyGeomRect(opts.textRect));
+		if (opts.textRectangle) parts.push(stringifyGeomRect(opts.textRectangle));
 		const pathsXml = opts.pathList.map(stringifyPath).join("");
 		parts.push(`<a:pathLst>${pathsXml}</a:pathLst>`);
 		return `<a:custGeom>${parts.join("")}</a:custGeom>`;
@@ -6682,8 +7522,8 @@ const customGeometryDesc = {
 		}
 		const rect = findChild(el, "a:rect");
 		if (rect) {
-			const textRect = readGeomRect(rect);
-			if (textRect) result.textRect = textRect;
+			const textRectangle = readGeomRect(rect);
+			if (textRectangle) result.textRectangle = textRectangle;
 		}
 		const pathLst = findChild(el, "a:pathLst");
 		if (pathLst?.elements) {
@@ -6847,18 +7687,18 @@ const shape3DDesc = {
 		if (el.attributes?.["contourW"] !== void 0) result.contourW = Number(el.attributes["contourW"]);
 		if (el.attributes?.["prstMaterial"] !== void 0) result.prstMaterial = xsdMaterialType.from(String(el.attributes["prstMaterial"]));
 		const bevelT = findChild(el, "a:bevelT");
-		if (bevelT) result.bevelT = parse(bevelDesc, bevelT, ctx);
+		if (bevelT) result.bevelT = parse$1(bevelDesc, bevelT, ctx);
 		const bevelB = findChild(el, "a:bevelB");
-		if (bevelB) result.bevelB = parse(bevelDesc, bevelB, ctx);
+		if (bevelB) result.bevelB = parse$1(bevelDesc, bevelB, ctx);
 		const extrusionClr = findChild(el, "a:extrusionClr");
 		if (extrusionClr) {
 			const solidFill = findChild(extrusionClr, "a:solidFill");
-			if (solidFill) result.extrusionColor = parse(solidFillDesc, solidFill, ctx);
+			if (solidFill) result.extrusionColor = parse$1(solidFillDesc, solidFill, ctx);
 		}
 		const contourClr = findChild(el, "a:contourClr");
 		if (contourClr) {
 			const solidFill = findChild(contourClr, "a:solidFill");
-			if (solidFill) result.contourColor = parse(solidFillDesc, solidFill, ctx);
+			if (solidFill) result.contourColor = parse$1(solidFillDesc, solidFill, ctx);
 		}
 		return result;
 	}
@@ -6925,9 +7765,9 @@ const scene3DDesc = {
 	parse(el, ctx) {
 		const result = {};
 		const camera = findChild(el, "a:camera");
-		if (camera) result.camera = parse(cameraDesc, camera, ctx);
+		if (camera) result.camera = parse$1(cameraDesc, camera, ctx);
 		const lightRig = findChild(el, "a:lightRig");
-		if (lightRig) result.lightRig = parse(lightRigDesc, lightRig, ctx);
+		if (lightRig) result.lightRig = parse$1(lightRigDesc, lightRig, ctx);
 		const backdrop = findChild(el, "a:backdrop");
 		if (backdrop) result.backdrop = readBackdrop(backdrop);
 		return result;
@@ -7146,7 +7986,7 @@ function readBlipEffects(el, ctx) {
 	const alphaInv = findChild(el, "a:alphaInv");
 	if (alphaInv) {
 		const solidFill = findChild(alphaInv, "a:solidFill");
-		if (solidFill) result.alphaInverse = parse(solidFillDesc, solidFill, ctx);
+		if (solidFill) result.alphaInverse = parse$1(solidFillDesc, solidFill, ctx);
 		else result.alphaInverse = {};
 	}
 	const alphaModFix = findChild(el, "a:alphaModFix");
@@ -7166,19 +8006,19 @@ function readBlipEffects(el, ctx) {
 		const clrFrom = findChild(clrChange, "a:clrFrom");
 		if (clrFrom) {
 			const fromFill = findChild(clrFrom, "a:solidFill");
-			if (fromFill) opts.from = parse(solidFillDesc, fromFill, ctx);
+			if (fromFill) opts.from = parse$1(solidFillDesc, fromFill, ctx);
 		}
 		const clrTo = findChild(clrChange, "a:clrTo");
 		if (clrTo) {
 			const toFill = findChild(clrTo, "a:solidFill");
-			if (toFill) opts.to = parse(solidFillDesc, toFill, ctx);
+			if (toFill) opts.to = parse$1(solidFillDesc, toFill, ctx);
 		}
 		result.colorChange = opts;
 	}
 	const clrRepl = findChild(el, "a:clrRepl");
 	if (clrRepl) {
 		const solidFill = findChild(clrRepl, "a:solidFill");
-		if (solidFill) result.colorRepl = { color: parse(solidFillDesc, solidFill, ctx) };
+		if (solidFill) result.colorRepl = { color: parse$1(solidFillDesc, solidFill, ctx) };
 	}
 	const blur = findChild(el, "a:blur");
 	if (blur) {
@@ -7192,7 +8032,7 @@ function readBlipEffects(el, ctx) {
 		const fills = [];
 		for (const child of duotone.elements) {
 			const sf = findChild(child, "a:solidFill");
-			if (sf) fills.push(parse(solidFillDesc, sf, ctx));
+			if (sf) fills.push(parse$1(solidFillDesc, sf, ctx));
 		}
 		if (fills.length >= 2) result.duotone = {
 			color1: fills[0],
@@ -7241,8 +8081,8 @@ const blipFillDesc = {
 			}, ctx);
 			if (blipXml) parts.push(blipXml);
 		}
-		if (opts.srcRect) {
-			const srcRectXml = stringify$1(sourceRectangleDesc, opts.srcRect, ctx);
+		if (opts.sourceRectangle) {
+			const srcRectXml = stringify$1(sourceRectangleDesc, opts.sourceRectangle, ctx);
 			if (srcRectXml) parts.push(srcRectXml);
 		}
 		if (opts.tile) {
@@ -7260,14 +8100,14 @@ const blipFillDesc = {
 		if (el.attributes?.["rotWithShape"] !== void 0) result.rotWithShape = el.attributes["rotWithShape"] !== "0";
 		const blip = findChild(el, "a:blip");
 		if (blip) {
-			const blipResult = parse(blipDesc, blip, ctx);
+			const blipResult = parse$1(blipDesc, blip, ctx);
 			if (blipResult.referenceId) result.referenceId = blipResult.referenceId;
 			if (blipResult.blipEffects) result.blipEffects = blipResult.blipEffects;
 		}
 		const srcRect = findChild(el, "a:srcRect");
-		if (srcRect) result.srcRect = parse(sourceRectangleDesc, srcRect, ctx);
+		if (srcRect) result.sourceRectangle = parse$1(sourceRectangleDesc, srcRect, ctx);
 		const tile = findChild(el, "a:tile");
-		if (tile) result.tile = parse(tileDesc, tile, ctx);
+		if (tile) result.tile = parse$1(tileDesc, tile, ctx);
 		return result;
 	}
 };
@@ -7278,7 +8118,7 @@ const blipFillDesc = {
 *
 * @module
 */
-const diagramRelIdsDesc = {
+const diagramRelationshipIdsDesc = {
 	kind: "custom",
 	stringify(opts, _ctx) {
 		return `<dgm:relIds r:dm="${escapeXml(opts.dm)}" r:lo="${escapeXml(opts.lo)}" r:qs="${escapeXml(opts.qs)}" r:cs="${escapeXml(opts.cs)}"/>`;
@@ -7297,30 +8137,30 @@ const diagramRelIdsDesc = {
 const diagramStyleDesc = {
 	kind: "custom",
 	stringify(opts, _ctx) {
-		return `<dgm:style><a:lnRef idx="${opts.lnIdx ?? 1}"><a:schemeClr val="accent1"/></a:lnRef><a:fillRef idx="${opts.fillIdx ?? 1}"><a:schemeClr val="accent1"/></a:fillRef><a:effectRef idx="${opts.effectIdx ?? 0}"><a:schemeClr val="accent1"/></a:effectRef><a:fontRef idx="${escapeXml(opts.fontIdx ?? "minor")}"><a:schemeClr val="tx1"/></a:fontRef></dgm:style>`;
+		return `<dgm:style><a:lnRef idx="${opts.lineReference?.idx ?? 1}"><a:schemeClr val="accent1"/></a:lnRef><a:fillRef idx="${opts.fillReference?.idx ?? 1}"><a:schemeClr val="accent1"/></a:fillRef><a:effectRef idx="${opts.effectReference?.idx ?? 0}"><a:schemeClr val="accent1"/></a:effectRef><a:fontRef idx="${escapeXml(opts.fontReference?.idx ?? "minor")}"><a:schemeClr val="tx1"/></a:fontRef></dgm:style>`;
 	},
 	parse(el, _ctx) {
 		const result = {};
 		const lnRef = findChild(el, "a:lnRef");
-		if (lnRef?.attributes?.["idx"] !== void 0) result.lnIdx = Number(lnRef.attributes["idx"]);
+		if (lnRef?.attributes?.["idx"] !== void 0) result.lineReference = { idx: Number(lnRef.attributes["idx"]) };
 		const fillRef = findChild(el, "a:fillRef");
-		if (fillRef?.attributes?.["idx"] !== void 0) result.fillIdx = Number(fillRef.attributes["idx"]);
+		if (fillRef?.attributes?.["idx"] !== void 0) result.fillReference = { idx: Number(fillRef.attributes["idx"]) };
 		const effectRef = findChild(el, "a:effectRef");
-		if (effectRef?.attributes?.["idx"] !== void 0) result.effectIdx = Number(effectRef.attributes["idx"]);
+		if (effectRef?.attributes?.["idx"] !== void 0) result.effectReference = { idx: Number(effectRef.attributes["idx"]) };
 		const fontRef = findChild(el, "a:fontRef");
-		if (fontRef?.attributes?.["idx"] !== void 0) result.fontIdx = String(fontRef.attributes["idx"]);
+		if (fontRef?.attributes?.["idx"] !== void 0) result.fontReference = { idx: String(fontRef.attributes["idx"]) };
 		return result;
 	}
 };
-const presLayoutVarsDesc = {
+const presentationLayoutVariablesDesc = {
 	kind: "custom",
 	stringify(opts, _ctx) {
 		const parts = [];
 		if (opts.orgChart?.val !== void 0) parts.push(`<dgm:orgChart val="${opts.orgChart.val ? 1 : 0}"/>`);
-		if (opts.chMax?.val !== void 0) parts.push(`<dgm:chMax val="${opts.chMax.val}"/>`);
-		if (opts.chPref?.val !== void 0) parts.push(`<dgm:chPref val="${opts.chPref.val}"/>`);
-		if (opts.animOne?.val !== void 0) parts.push(`<dgm:animOne val="${escapeXml(opts.animOne.val)}"/>`);
-		if (opts.animLvl?.val !== void 0) parts.push(`<dgm:animLvl val="${escapeXml(opts.animLvl.val)}"/>`);
+		if (opts.maxChildren?.val !== void 0) parts.push(`<dgm:chMax val="${opts.maxChildren.val}"/>`);
+		if (opts.preferredChildren?.val !== void 0) parts.push(`<dgm:chPref val="${opts.preferredChildren.val}"/>`);
+		if (opts.animateOneByOne?.val !== void 0) parts.push(`<dgm:animOne val="${escapeXml(opts.animateOneByOne.val)}"/>`);
+		if (opts.animationLevel?.val !== void 0) parts.push(`<dgm:animLvl val="${escapeXml(opts.animationLevel.val)}"/>`);
 		if (opts.hierBranch?.val !== void 0) parts.push(`<dgm:hierBranch val="${escapeXml(opts.hierBranch.val)}"/>`);
 		if (parts.length === 0) return `<dgm:presLayoutVars/>`;
 		return `<dgm:presLayoutVars>${parts.join("")}</dgm:presLayoutVars>`;
@@ -7330,19 +8170,19 @@ const presLayoutVarsDesc = {
 		const orgChart = findChild(el, "dgm:orgChart");
 		if (orgChart?.attributes?.["val"] !== void 0) result.orgChart = { val: orgChart.attributes["val"] === 1 || orgChart.attributes["val"] === "1" };
 		const chMax = findChild(el, "dgm:chMax");
-		if (chMax?.attributes?.["val"] !== void 0) result.chMax = { val: Number(chMax.attributes["val"]) };
+		if (chMax?.attributes?.["val"] !== void 0) result.maxChildren = { val: Number(chMax.attributes["val"]) };
 		const chPref = findChild(el, "dgm:chPref");
-		if (chPref?.attributes?.["val"] !== void 0) result.chPref = { val: Number(chPref.attributes["val"]) };
+		if (chPref?.attributes?.["val"] !== void 0) result.preferredChildren = { val: Number(chPref.attributes["val"]) };
 		const animOne = findChild(el, "dgm:animOne");
-		if (animOne?.attributes?.["val"] !== void 0) result.animOne = { val: String(animOne.attributes["val"]) };
+		if (animOne?.attributes?.["val"] !== void 0) result.animateOneByOne = { val: String(animOne.attributes["val"]) };
 		const animLvl = findChild(el, "dgm:animLvl");
-		if (animLvl?.attributes?.["val"] !== void 0) result.animLvl = { val: String(animLvl.attributes["val"]) };
+		if (animLvl?.attributes?.["val"] !== void 0) result.animationLevel = { val: String(animLvl.attributes["val"]) };
 		const hierBranch = findChild(el, "dgm:hierBranch");
 		if (hierBranch?.attributes?.["val"] !== void 0) result.hierBranch = { val: String(hierBranch.attributes["val"]) };
 		return result;
 	}
 };
-const diagramExtLstDesc = {
+const diagramExtensionListDesc = {
 	kind: "custom",
 	stringify(opts, _ctx) {
 		if (!opts.extensions?.length) return void 0;
@@ -7639,4 +8479,4 @@ function replaceHyperlinkPlaceholders(xml, hyperlinks, offset) {
 	return replacePlaceholders(xml, map);
 }
 //#endregion
-export { solidFillDesc as $, createTileInfo as $n, createDefault as $r, convertToTwip as $t, bevelDesc as A, createFillOverlayEffect as An, createScRgbColor as Ar, createChMax as At, shapeLockingDesc as B, createLineEnd as Bn, createPacker as Br, createTableStyleList as Bt, diagramStyleDesc as C, PresetShadowVal as Cn, uniqueUuid as Cr, AnimLevelValue as Ct, sourceRectangleDesc as D, createInnerShadowEffect as Dn, createSystemColor as Dr, createAdjLst as Dt, blipFillDesc as E, createOuterShadowEffect as En, SystemColor as Er, createAdj as Et, customGeometryDesc as F, PresetDash as Fn, createColorTransforms as Fr, createGraphicFrameLocking as Ft, patternFillDesc as G, extractBlipFillMedia as Gn, unzipSync$1 as Gr, convertEmuToPoints as Gt, outlineDesc as H, createGroupFill as Hn, levelForMediaName as Hr, createTransformation as Ht, presetGeometryDesc as I, createOutline as In, ParsedArchive as Ir, createGroupLocking as It, parseColorChoice as J, PathShadeType as Jn, OoxmlMimeType as Jr, convertMillimetersToTwip as Jt, getColorDescriptor as K, PresetPattern as Kn, zipAndConvert as Kr, convertInchesToEmu as Kt, graphicFrameLockingDesc as L, LineEndLength as Ln, parseArchive as Lr, createPictureLocking as Lt, shape3DDesc as M, LineCap as Mn, PresetColor as Mr, createHierBranch as Mt, groupTransform2DDesc as N, LineJoin as Nn, createPresetColor as Nr, createOrgChart as Nt, stretchDesc as O, createGlowEffect as On, SchemeColor as Or, createAnimLvl as Ot, transform2DDesc as P, PenAlignment as Pn, createHslColor as Pr, createPresLayoutVars as Pt, schemeColorDesc as Q, TileAlignment as Qn, parseCorePropsElement as Qr, convertToEmu as Qt, groupLockingDesc as R, LineEndType as Rn, ZIP_DEFLATE_LEVEL as Rr, createShapeLocking as Rt, diagramRelIdsDesc as S, createReflectionEffect as Sn, uniqueNumericIdCreator as Sr, createStyleDefHdrLst as St, blipDesc as T, RectAlignment as Tn, createSolidFill as Tr, HierBranchStyle as Tt, fillDesc as U, createNoFill as Un, strFromU8$1 as Ur, convertEmuToInches as Ut, effectListDesc as V, createCustomDash as Vn, createZipStream as Vr, parseTableStyleList as Vt, gradientFillDesc as W, buildFill as Wn, toUint8Array$1 as Wr, convertEmuToPixels as Wt, rgbColorDesc as X, createGradientFill as Xn, buildCorePropertiesXml as Xr, convertPointsToEmu as Xt, presetColorDesc as Y, TileFlipMode as Yn, convertOutput as Yr, convertPixelsToEmu as Yt, scRgbColorDesc as Z, createGradientStop as Zn, buildCorePropertiesXmlString as Zr, convertPositionToEmu as Zt, derivePasswordHash as _, createScene3D as _n, xsdVerticalMergeRev as _r, createColorsDefHdr as _t, getMediaRefs as a, stringifyStretch as an, xsdLineEndSize as ar, ColorMethod as at, compileMapping as b, createEffectList as bn, hashedId as br, createLayoutDefHdrLst as bt, hasPlaceholders as c, createExtentionList as cn, xsdPattern as cr, StyleMatrixIndex as ct, replaceHyperlinkPlaceholders as d, stringifyAdjustmentValues as dn, xsdRectAlignment as dr, createFillClrLst as dt, createOverride as ei, convertUniversalMeasureToEmu as en, invertMap as er, systemColorDesc as et, replaceImagePlaceholders as f, PresetMaterialType as fn, xsdStrikeStyle as fr, createLinClrLst as ft, replaceVideoPlaceholders as g, createBottomBevel as gn, xsdUnderlineStyle as gr, createTxLinClrLst as gt, replaceSmartArtPlaceholders as h, createBevel as hn, xsdTextCaps as hr, createTxFillClrLst as ht, formatId as i, createTransform2D as in, xsdLineCap as ir, createDiagramRelIds as it, scene3DDesc as j, CompoundLine as jn, createRgbColor as jr, createChPref as jt, tileDesc as k, BlendMode as kn, createSchemeColor as kr, createAnimOne as kt, replaceAllPlaceholders as l, createCustomGeometry as ln, xsdPenAlignment as lr, createDiagramStyle as lt, replaceNumberingPlaceholders as m, BevelPresetType as mn, xsdTextAnchor as mr, createTxEffectClrLst as mt, collectPlaceholderKeys as n, TargetModeType as ni, parseUniversalMeasure as nn, xsdCompoundLine as nr, createDiagramSp3d as nt, getReferencedMedia as o, createBlipFill as on, xsdMaterialType as or, FontCollectionIndex as ot, replaceMediaPlaceholders as p, createShape3D as pn, xsdTextAlign as pr, createStyleLbl as pt, hslColorDesc as q, createPatternFill as qn, zipSyncAndConvert as qr, convertInchesToTwip as qt, findAndReplaceImagePlaceholders as r, APP_PROPS_XML as ri, createGroupTransform2D as rn, xsdEffectContainer as rr, createDiagramTxPr as rt, getVideoRefs as s, createBlip as sn, xsdPathFillMode as sr, HueDirection as st, addSmartArtRelationships as t, Relationships as ti, convertUniversalMeasureToTwip as tn, xsdBlendMode as tr, createDiagramExtLst as tt, replaceChartPlaceholders as u, stringifyPresetGeometry as un, xsdPresetShadow as ur, createEffectClrLst as ut, hashPasswordAgile as v, createEffectDag as vn, createSourceRectangle as vr, createColorsDefHdrLst as vt, presLayoutVarsDesc as w, createPresetShadowEffect as wn, createColorElement as wr, AnimOneValue as wt, diagramExtLstDesc as x, createSoftEdgeEffect as xn, uniqueId as xr, createStyleDefHdr as xt, randomBytes as y, calculateEffectExtent as yn, createBlipEffects as yr, createLayoutDefHdr as yt, pictureLockingDesc as z, LineEndWidth as zn, ZIP_STORED_LEVEL as zr, createTableStyle as zt };
+export { solidFillDesc as $, createTileInfo as $n, toUint8Array as $r, convertToTwip as $t, bevelDesc as A, createFillOverlayEffect as An, createScRgbColor as Ar, createHierBranch as At, shapeLockingDesc as B, createLineEnd as Bn, XLSX_PARTS as Br, createTableStyleList as Bt, diagramStyleDesc as C, PresetShadowVal as Cn, uniqueUuid as Cr, AnimateOneByOneValue as Ct, sourceRectangleDesc as D, createInnerShadowEffect as Dn, createSystemColor as Dr, createAdjustList as Dt, blipFillDesc as E, createOuterShadowEffect as En, SystemColor as Er, createAdjust as Et, customGeometryDesc as F, PresetDash as Fn, createColorTransforms as Fr, createGraphicFrameLocking as Ft, patternFillDesc as G, extractBlipFillMedia as Gn, ZIP_DEFLATE_LEVEL as Gr, convertEmuToPoints as Gt, outlineDesc as H, createGroupFill as Hn, validateOpcConsistency as Hr, createTransformation as Ht, presetGeometryDesc as I, createOutline as In, buildContentTypeOverrides as Ir, createGroupLocking as It, parseColorChoice as J, PathShadeType as Jn, createZipStream as Jr, convertMillimetersToTwip as Jt, getColorDescriptor as K, PresetPattern as Kn, ZIP_STORED_LEVEL as Kr, convertInchesToEmu as Kt, graphicFrameLockingDesc as L, LineEndLength as Ln, DOCX_PARTS as Lr, createPictureLocking as Lt, shape3DDesc as M, LineCap as Mn, PresetColor as Mr, createOrgChart as Mt, groupTransform2DDesc as N, LineJoin as Nn, createPresetColor as Nr, createPreferredChildren as Nt, stretchDesc as O, createGlowEffect as On, SchemeColor as Or, createAnimateOneByOne as Ot, transform2DDesc as P, PenAlignment as Pn, createHslColor as Pr, createPresentationLayoutVariables as Pt, schemeColorDesc as Q, TileAlignment as Qn, strFromU8$1 as Qr, convertToEmu as Qt, groupLockingDesc as R, LineEndType as Rn, PART_REGISTRIES as Rr, createShapeLocking as Rt, diagramRelationshipIdsDesc as S, createReflectionEffect as Sn, uniqueNumericIdCreator as Sr, createStyleDefinitionHeaderList as St, blipDesc as T, RectAlignment as Tn, createSolidFill as Tr, HierBranchStyle as Tt, fillDesc as U, createNoFill as Un, ParsedArchive as Ur, convertEmuToInches as Ut, effectListDesc as V, createCustomDash as Vn, summarizeOpcIssues as Vr, parseTableStyleList as Vt, gradientFillDesc as W, buildFill as Wn, parseArchive as Wr, convertEmuToPixels as Wt, rgbColorDesc as X, createGradientFill as Xn, isBase64DataURL as Xr, convertPointsToEmu as Xt, presetColorDesc as Y, TileFlipMode as Yn, decodeBase64 as Yr, convertPixelsToEmu as Yt, scRgbColorDesc as Z, createGradientStop as Zn, levelForMediaName as Zr, convertPositionToEmu as Zt, derivePasswordHash as _, createScene3D as _n, xsdVerticalMergeRev as _r, createColorsDefinitionHeader as _t, getMediaRefs as a, buildCorePropertiesXml as ai, stringifyStretch as an, xsdLineEndSize as ar, ColorMethod as at, compileMapping as b, createEffectList as bn, hashedId as br, createLayoutDefinitionHeaderList as bt, hasPlaceholders as c, createDefault as ci, createExtentionList as cn, xsdPattern as cr, StyleMatrixIndex as ct, replaceHyperlinkPlaceholders as d, TargetModeType as di, stringifyAdjustmentValues as dn, xsdRectAlignment as dr, createFillColorList as dt, unzipSync$1 as ei, convertUniversalMeasureToEmu as en, invertMap as er, systemColorDesc as et, replaceImagePlaceholders as f, APP_PROPS_XML as fi, PresetMaterialType as fn, xsdStrikeStyle as fr, createLineColorList as ft, replaceVideoPlaceholders as g, createBottomBevel as gn, xsdUnderlineStyle as gr, createTextLineColorList as gt, replaceSmartArtPlaceholders as h, createBevel as hn, xsdTextCaps as hr, createTextFillColorList as ht, formatId as i, convertOutput as ii, createTransform2D as in, xsdLineCap as ir, createDiagramRelationshipIds as it, scene3DDesc as j, CompoundLine as jn, createRgbColor as jr, createMaxChildren as jt, tileDesc as k, BlendMode as kn, createSchemeColor as kr, createAnimationLevel as kt, replaceAllPlaceholders as l, createOverride as li, createCustomGeometry as ln, xsdPenAlignment as lr, createDiagramStyle as lt, replaceNumberingPlaceholders as m, BevelPresetType as mn, xsdTextAnchor as mr, createTextEffectColorList as mt, collectPlaceholderKeys as n, zipSyncAndConvert as ni, parseUniversalMeasure as nn, xsdCompoundLine as nr, createDiagramShape3D as nt, getReferencedMedia as o, buildCorePropertiesXmlString as oi, createBlipFill as on, xsdMaterialType as or, FontCollectionIndex as ot, replaceMediaPlaceholders as p, createShape3D as pn, xsdTextAlign as pr, createStyleLabel as pt, hslColorDesc as q, createPatternFill as qn, createPacker as qr, convertInchesToTwip as qt, findAndReplaceImagePlaceholders as r, OoxmlMimeType as ri, createGroupTransform2D as rn, xsdEffectContainer as rr, createDiagramTextProperties as rt, getVideoRefs as s, parseCorePropsElement as si, createBlip as sn, xsdPathFillMode as sr, HueDirection as st, addSmartArtRelationships as t, zipAndConvert as ti, convertUniversalMeasureToTwip as tn, xsdBlendMode as tr, createDiagramExtensionList as tt, replaceChartPlaceholders as u, Relationships as ui, stringifyPresetGeometry as un, xsdPresetShadow as ur, createEffectColorList as ut, hashPasswordAgile as v, createEffectDag as vn, createSourceRectangle as vr, createColorsDefinitionHeaderList as vt, presentationLayoutVariablesDesc as w, createPresetShadowEffect as wn, createColorElement as wr, AnimationLevelValue as wt, diagramExtensionListDesc as x, createSoftEdgeEffect as xn, uniqueId as xr, createStyleDefinitionHeader as xt, randomBytes as y, calculateEffectExtent as yn, createBlipEffects as yr, createLayoutDefinitionHeader as yt, pictureLockingDesc as z, LineEndWidth as zn, PPTX_PARTS as zr, createTableStyle as zt };