@shbernal/ts-pptx 3.3.0 → 3.5.0

package/dist/script.js

@@ -1,5 +1,6 @@
 import { a as TsPptxError, i as PackageReadError, n as InvalidOptionError, o as UnsupportedFeatureError, r as MediaError, t as InternalError } from "./errors-Bvln0H-7.js";
-import { a as isConnector, c as isPicture, i as isAutoShape, o as isGraphicFrame, s as isGroupShape } from "./shapes-BXVgsk0F.js";
+import { t as OOXML_NS } from "./namespaces-CcKuzeuE.js";
+import { a as isConnector, c as isPicture, i as isAutoShape, o as isGraphicFrame, s as isGroupShape } from "./shapes-Kt51vry6.js";
 //#region src/script/fidelity.ts
 /**
 * Accumulates notes while a deck is walked, so the walk itself stays a plain
@@ -350,12 +351,8 @@ function noteUncarriedGeometry(picture, notes, subject) {
 * Each check here is a standing argument for a real accessor. When one lands, the
 * corresponding function should be deleted, not kept in sync.
 */
-/** DrawingML main namespace — hosts `a:videoFile` / `a:audioFile` under `p:nvPr`. */
-const A_NS = "http://schemas.openxmlformats.org/drawingml/2006/main";
 /** Office MathML namespace — the equation body itself, wrapped by `a14:m` in a text run. */
 const MATH_NS = "http://schemas.openxmlformats.org/officeDocument/2006/math";
-/** PresentationML main namespace — `p:grpSpPr`, `p:txStyles`, `p:spTree`. */
-const P_NS = "http://schemas.openxmlformats.org/presentationml/2006/main";
 /** Shape-tree children that carry drawing content, as opposed to the tree's own properties. */
 const SHAPE_ELEMENTS = /* @__PURE__ */ new Set([
 	"sp",
@@ -404,7 +401,7 @@ function children(element) {
 * without this check a video converts to a static image that looks deliberate.
 */
 function isAudioVideo(element) {
-	return has(element, A_NS, "videoFile") || has(element, A_NS, "audioFile");
+	return has(element, OOXML_NS.a, "videoFile") || has(element, OOXML_NS.a, "audioFile");
 }
 /**
 * `true` when this shape's text body contains an OMML equation.
@@ -431,7 +428,7 @@ function hasEquation(element) {
 * would otherwise answer for its first child.
 */
 function isTextBox(element) {
-	return child(child(element, P_NS, "nvSpPr"), P_NS, "cNvSpPr")?.getAttribute("txBox") === "1";
+	return child(child(element, OOXML_NS.p, "nvSpPr"), OOXML_NS.p, "cNvSpPr")?.getAttribute("txBox") === "1";
 }
 /**
 * `true` when a group's child coordinate space equals its own frame, so its children are
@@ -446,12 +443,12 @@ function isTextBox(element) {
 * `true` rather than unknown.
 */
 function hasIdentityChildSpace(element) {
-	const xfrm = child(child(element, P_NS, "grpSpPr"), A_NS, "xfrm");
+	const xfrm = child(child(element, OOXML_NS.p, "grpSpPr"), OOXML_NS.a, "xfrm");
 	if (!xfrm) return true;
-	const off = child(xfrm, A_NS, "off");
-	const ext = child(xfrm, A_NS, "ext");
-	const chOff = child(xfrm, A_NS, "chOff");
-	const chExt = child(xfrm, A_NS, "chExt");
+	const off = child(xfrm, OOXML_NS.a, "off");
+	const ext = child(xfrm, OOXML_NS.a, "ext");
+	const chOff = child(xfrm, OOXML_NS.a, "chOff");
+	const chExt = child(xfrm, OOXML_NS.a, "chExt");
 	if (!off || !ext || !chOff || !chExt) return true;
 	return off.getAttribute("x") === chOff.getAttribute("x") && off.getAttribute("y") === chOff.getAttribute("y") && ext.getAttribute("cx") === chExt.getAttribute("cx") && ext.getAttribute("cy") === chExt.getAttribute("cy");
 }
@@ -464,7 +461,7 @@ function hasIdentityChildSpace(element) {
 * scheme is repainted with Office's, and this is the only way to notice.
 */
 function hasFormatScheme(element) {
-	return has(element, A_NS, "fmtScheme");
+	return has(element, OOXML_NS.a, "fmtScheme");
 }
 /**
 * `true` when this slide master declares per-level text styles (`p:txStyles`) with content.
@@ -474,7 +471,7 @@ function hasFormatScheme(element) {
 * converter and comes back as PowerPoint's built-in default.
 */
 function hasTextStyles(element) {
-	return children(child(element, P_NS, "txStyles")).some((group) => children(group).length > 0);
+	return children(child(element, OOXML_NS.p, "txStyles")).some((group) => children(group).length > 0);
 }
 /**
 * `true` when this shape is a placeholder — the tier that *reserves* a region for a slide to
@@ -492,7 +489,7 @@ function hasTextStyles(element) {
 * cannot survive being flattened into loose objects.
 */
 function isPlaceholderShape(element) {
-	return has(element, P_NS, "ph");
+	return has(element, OOXML_NS.p, "ph");
 }
 /**
 * `true` when this master or layout carries a shape that is not a placeholder — a logo, a
@@ -506,7 +503,7 @@ function isPlaceholderShape(element) {
 * rather than an unconditional note.
 */
 function hasDecorativeShapes(element) {
-	return children(child(child(element, P_NS, "cSld"), P_NS, "spTree")).some((shape) => shape.namespaceURI === P_NS && SHAPE_ELEMENTS.has(shape.localName ?? "") && !isPlaceholderShape(shape));
+	return children(child(child(element, OOXML_NS.p, "cSld"), OOXML_NS.p, "spTree")).some((shape) => shape.namespaceURI === OOXML_NS.p && SHAPE_ELEMENTS.has(shape.localName ?? "") && !isPlaceholderShape(shape));
 }
 //#endregion
 //#region src/script/from-read/text.ts
@@ -1781,18 +1778,40 @@ function connectorCall(shape, notes) {
 		...nameOf(shape)
 	};
 }
+/**
+* Why a graphic frame cannot be authored from a script, or `null` when it can.
+*
+* The single enumeration of the payloads with no write-API emitter, and the reason it is a
+* function rather than a condition spelled at each site: `graphicFrameCall` needs it to pick
+* a fidelity note, and `hasUnwritableContent` in `from-read/deck.ts` needs it to decide
+* whether the printer must copy the slide instead of transcribing it. Those were two
+* hand-maintained lists, they disagreed — the deck-level one named extended charts only — and
+* a SmartArt slide was therefore transcribed with a hole where the graphic had been. The two
+* consequences are the same for every member, so the membership has to be too.
+*/
+function unwritableFramePayload(shape) {
+	if (shape.table || shape.chart) return null;
+	if (shape.hasChartEx) return "chartEx";
+	if (shape.hasDiagram) return "diagram";
+	return "unknown";
+}
 /** A `GraphicFrame` hosts a table or a chart; both have their own mapper. */
 function graphicFrameCall(shape, notes, assets) {
 	const table = shape.table;
 	if (table) return tableCall(shape, table, notes, assets);
 	const chart = shape.chart;
 	if (chart) return chartCall(shape, chart, notes);
-	if (shape.hasChartEx) {
-		notes.note("chartEx.all", "dropped", "unwritable", "an extended chart (waterfall, funnel, box-and-whisker, …) has a full reader but no write-API counterpart");
-		return null;
+	switch (unwritableFramePayload(shape)) {
+		case "chartEx":
+			notes.note("chartEx.all", "dropped", "unwritable", "an extended chart (waterfall, funnel, box-and-whisker, …) has a full reader but no write-API counterpart");
+			return null;
+		case "diagram":
+			notes.note("diagram.all", "dropped", "unwritable", "a SmartArt diagram has a full reader and its text can be edited in place through it (DiagramPoint.text), but no write API authors one from a script, so a converted script cannot describe this frame");
+			return null;
+		default:
+			notes.note("graphicFrame.unknown", "dropped", "unread", "this graphic frame hosts none of a table, a chart or a SmartArt diagram (an OLE object or an ink annotation), which the read model does not decode");
+			return null;
 	}
-	notes.note("graphicFrame.unknown", "dropped", "unread", "this graphic frame hosts neither a table nor a chart (SmartArt or an OLE object), which the read model does not decode");
-	return null;
 }
 /**
 * A `GroupShape` becomes `addGroup`, with each child mapped and re-tagged into the
@@ -1840,6 +1859,28 @@ function groupCall(shape, notes, assets) {
 * `addGroup` excludes. The tagged form is a single-key object, not a `{ type, args }` pair.
 */
 function asGroupChild(call) {
+	const shared = commonShapeVariant(call);
+	if (shared) return shared;
+	const [first, second] = call.args;
+	switch (call.method) {
+		case "addGroup": return { group: compact({
+			children: first,
+			options: second
+		}) ?? {} };
+		default: return null;
+	}
+}
+/**
+* The three key-tagged variants both union-shaped call sites emit identically: a text box, an
+* auto shape, and an image. `null` when `call.method` is not one of them, which is the signal
+* for the caller to try its own extra arms.
+*
+* Shared rather than duplicated because this is exactly where a fourth common variant would be
+* added to one site and forgotten in the other. What is deliberately *not* shared is either
+* caller's `default`: a group child silently declines a chart, while a layout object reports it
+* as a fidelity loss, and that difference is the point of having two functions.
+*/
+function commonShapeVariant(call) {
 	const [first, second] = call.args;
 	switch (call.method) {
 		case "addText": return { text: compact({
@@ -1851,10 +1892,6 @@ function asGroupChild(call) {
 			options: second
 		}) ?? {} };
 		case "addImage": return { image: first ?? {} };
-		case "addGroup": return { group: compact({
-			children: first,
-			options: second
-		}) ?? {} };
 		default: return null;
 	}
 }
@@ -1891,17 +1928,10 @@ function masterObject(shape, notes, assets) {
 	}
 	const call = shapeCall(shape, notes, assets);
 	if (!call) return null;
+	const shared = commonShapeVariant(call);
+	if (shared) return shared;
 	const [first, second] = call.args;
 	switch (call.method) {
-		case "addText": return { text: compact({
-			text: first,
-			options: second
-		}) ?? {} };
-		case "addShape": return { shape: compact({
-			type: first,
-			options: second
-		}) ?? {} };
-		case "addImage": return { image: first ?? {} };
 		case "addChart": {
 			const options = second !== null && typeof second === "object" && !Array.isArray(second) && !isAssetRef(second) ? second : null;
 			const type = options?.["type"];
@@ -2380,7 +2410,7 @@ function slideToIr(slide, number, collector, assets, layouts) {
 	};
 	const transition = transitionToIr(slide, notes, assets);
 	const carried = hasUnwritableContent(slide);
-	if (carried) notes.note("slide.carried", "flattened", "unwritable", "this slide holds an extended chart (waterfall, funnel, box-and-whisker, …), which has a full reader but no write-API emitter; a printer that can copy the source slide does so instead of transcribing it, so it renders correctly but the emitted script does not describe its contents");
+	if (carried) notes.note("slide.carried", "flattened", "unwritable", "this slide holds a graphic frame the write API cannot author (an extended chart, a SmartArt diagram, an OLE object or ink); a printer that can copy the source slide does so instead of transcribing it, so it renders correctly but the emitted script does not describe its contents. The per-shape note beside this one says which construct forced the copy");
 	const calls = [];
 	for (const shape of slide.shapes) {
 		const call = shapeCall(shape, notes, assets);
@@ -2397,11 +2427,16 @@ function slideToIr(slide, number, collector, assets, layouts) {
 /**
 * `true` when the slide holds something with no write-API expression at all, forcing a
 * carried slide. Descends into groups, since a group can host a graphic frame.
+*
+* Membership comes from {@link unwritableFramePayload}, which `graphicFrameCall` also uses to
+* pick its note — one enumeration, so the two cannot drift apart again. This test named
+* extended charts alone until then, which is why a slide holding SmartArt (or an OLE object,
+* or ink) was transcribed as `authored` and rendered with a hole where the graphic had been.
 */
 function hasUnwritableContent(slide) {
 	const check = (shapes) => shapes.some((shape) => {
 		if (isGroupShape(shape)) return check(shape.shapes);
-		return isGraphicFrame(shape) && shape.hasChartEx;
+		return isGraphicFrame(shape) && unwritableFramePayload(shape) !== null;
 	});
 	return check(slide.shapes);
 }
@@ -2709,6 +2744,28 @@ function wrap(text, width, continuation) {
 	if (current) lines.push(current);
 	return lines;
 }
+/**
+* Close out a printed script: the accumulated lines as one module source, plus the
+* asset side-car the caller has to write beside it.
+*
+* Both tiers end this way, and the `assetMode` test is the whole reason it is worth
+* naming. In `'inline'` mode the bytes are already in {@link PrintedScript.code} as
+* `data:` literals, so the map must come back **empty** — a tier that returned them
+* anyway would have its caller write every image to disk as well, and the script would
+* ignore the files it was handed.
+* @param {string[]} lines - the script's lines, in order
+* @param {DeckIr} ir - the IR being printed, for its assets
+* @param {AssetMode} assetMode - how image bytes reach the script
+* @param {FidelityNote[]} notes - the losses that apply to this output
+* @returns {PrintedScript} the finished script
+*/
+function printedScript(lines, ir, assetMode, notes) {
+	return {
+		code: lines.join("\n"),
+		assets: new Map(assetMode === "file" ? ir.assets.map((asset) => [asset.name, asset.bytes]) : []),
+		notes
+	};
+}
 //#endregion
 //#region src/script/print/script.ts
 /**
@@ -2794,19 +2851,22 @@ function printScript(ir, options = {}) {
 	const assetLines = printAssetBindings(ir, assetNames, assetDir, assetMode);
 	if (assetLines.length > 0) lines.push("", ...assetLines);
 	lines.push("", "/**", " * A generator sized to the template. appendSlides compares slide sizes exactly and", " * throws when they differ, so the inches here must round-trip to the source EMU.", " */", "function generator(): TsPptx {", "	const pptx = new TsPptx()", `\tpptx.defineLayout({ name: 'source', width: ${inches(ir.slideSize.widthEmu)}, height: ${inches(ir.slideSize.heightEmu)} })`, "	pptx.layout = 'source'", "	return pptx", "}", ...body, "", `await writeFile(here(${printString(outputPath)}), await deck.save())`, "");
-	return {
-		code: lines.join("\n"),
-		assets: new Map(assetMode === "file" ? ir.assets.map((asset) => [asset.name, asset.bytes]) : []),
-		notes
-	};
+	return printedScript(lines, ir, assetMode, notes);
 }
 /**
-* The slide statements, batched into generators.
+* The slide statements, batched into generators, preceded by the layout handles they bind to.
 *
 * A batch ends when the layout changes or a carried slide interrupts, because
 * `appendSlides` binds one layout per call and a carried slide is not authored at all.
+*
+* Every layout `const` is hoisted above the first statement rather than emitted where it is
+* first used. `deck.layouts()` is a snapshot of the gallery, and `importSlide` — the call a
+* carried slide prints — grows that gallery with the source slide's own layout and master.
+* Resolving a handle after one has run is therefore resolving against a deck that has already
+* moved; capturing every handle up front is the only ordering that cannot.
 */
 function printSlides$1(ir, collector, printAsset) {
+	const declarations = [];
 	const lines = [];
 	let batch = [];
 	let generatorIndex = 0;
@@ -2818,7 +2878,7 @@ function printSlides$1(ir, collector, printAsset) {
 		const name = `gen${++generatorIndex}`;
 		lines.push("", `const ${name} = generator()`);
 		for (const slide of batch) lines.push(...printAuthoredSlide(slide, name, collector, printAsset));
-		lines.push("", ...printAppend(name, first, collector, declaredLayouts));
+		lines.push("", printAppend(name, first, collector, declaredLayouts, declarations));
 		batch = [];
 	};
 	for (const slide of ir.slides) {
@@ -2832,31 +2892,39 @@ function printSlides$1(ir, collector, printAsset) {
 		batch.push(slide);
 	}
 	flush();
-	return lines;
+	return declarations.length > 0 ? [
+		"",
+		...declarations,
+		...lines
+	] : lines;
 }
 /**
 * The `appendSlides` call closing a batch, binding by layout name where that is
-* unambiguous and by gallery position where it is not.
+* unambiguous and by gallery position where it is not. Any handle it needs is appended to
+* `declarations`, which the caller hoists above every statement.
 *
 * Binding by name is preferred because it survives being re-pointed at a different
 * template and because it is legible. But `appendSlides` *throws* on an ambiguous name
-* rather than picking one, and a multi-master deck routinely repeats layout names, so the
-* positional form is the only thing that resolves there.
+* rather than picking one, so the positional form resolves the case where the name does not
+* identify one layout: a multi-master deck that repeats layout names.
+*
+* A carried slide used to demote every binding in the script to a position too, because its
+* `importSlide` copied the source layout in under a second name-alike entry. `importSlide`
+* now binds to the chrome the template already holds (`read/api/ops/part-reuse.ts`), and
+* this deck's template *is* the source file, so the gallery no longer grows and the names
+* stay unambiguous.
 */
-function printAppend(generatorName, first, collector, declared) {
+function printAppend(generatorName, first, collector, declared, declarations) {
 	const layout = first.layout;
-	if (!layout) return [`await deck.appendSlides(${generatorName}, { layout: fallbackLayout })`];
-	if (layout.nameIsUnique) return [`await deck.appendSlides(${generatorName}, { layout: ${printString(layout.name)} })`];
+	if (!layout) return `await deck.appendSlides(${generatorName}, { layout: fallbackLayout })`;
+	if (layout.nameIsUnique) return `await deck.appendSlides(${generatorName}, { layout: ${printString(layout.name)} })`;
 	scopeNotes(collector, first.number).note("slide.layout", "approximated", "unsupported", `more than one layout in the source deck is named ${JSON.stringify(layout.name)}, so this slide binds to gallery position ${layout.index} instead; re-pointing the script at a different template will not track the name`);
 	const identifier = `layout${layout.index}`;
-	const append = `await deck.appendSlides(${generatorName}, { layout: ${identifier} })`;
-	if (declared.has(layout.index)) return [append];
-	declared.add(layout.index);
-	return [
-		`const ${identifier} = deck.layouts()[${layout.index}] // ${JSON.stringify(layout.name)}`,
-		`if (!${identifier}) throw new Error('the template has no layout at position ${layout.index}')`,
-		append
-	];
+	if (!declared.has(layout.index)) {
+		declared.add(layout.index);
+		declarations.push(`const ${identifier} = deck.layouts()[${layout.index}] // ${JSON.stringify(layout.name)}`, `if (!${identifier}) throw new Error('the template has no layout at position ${layout.index}')`);
+	}
+	return `await deck.appendSlides(${generatorName}, { layout: ${identifier} })`;
 }
 /** One authored slide, plus the layout-binding note this tier is responsible for. */
 function printAuthoredSlide(slide, generatorName, collector, printAsset) {
@@ -2928,11 +2996,7 @@ function printStandaloneScript(ir, options = {}) {
 	if (assetLines.length > 0) lines.push("", ...assetLines);
 	if (masters.length > 0) lines.push("", ...masters);
 	lines.push(...body, "", `await pptx.writeFile({ fileName: here(${printString(outputPath)}) })`, "");
-	return {
-		code: lines.join("\n"),
-		assets: new Map(assetMode === "file" ? ir.assets.map((asset) => [asset.name, asset.bytes]) : []),
-		notes
-	};
+	return printedScript(lines, ir, assetMode, notes);
 }
 /**
 * The document properties the write API can set.
@@ -3267,6 +3331,7 @@ const NOTE_FIELDS = {
 	"deck.docProps": [],
 	"deck.docPropsDefault": [],
 	"deck.slideSize": ["widthEmu", "heightEmu"],
+	"diagram.all": ["*"],
 	"fill.gradient.path": ["gradient", "fill"],
 	"fill.picture": ["fill", "color"],
 	"fill.picture.geometry": [],