@segnavia/render 0.7.0 → 0.9.0

package/dist/deck-pdf.js

@@ -4,8 +4,9 @@ import { pdfPixelBox } from "./pdf-geometry.js";
 import { composeImposedPdf, drawClippedPage, embedOnePage } from "./pdf-compose.js";
 import { Imposition, fitPage, impose, pagePlacementLayout } from "@segnavia/format";
 import { newNonce } from "@segnavia/frame/bridge";
-import { htmlSlideDocument, notesLayoutGeometry, printableDeck } from "@segnavia/frame/print-document";
+import { htmlSlideDocument, notesLayoutGeometry, paginateNotes, printableDeck } from "@segnavia/frame/print-document";
 import { PDFDocument } from "pdf-lib";
+import { fitImage, imageLayerStyles } from "@segnavia/frame/image-fit";
 //#region src/deck-pdf.ts
 function nameSlideError(error, id) {
 	if (error instanceof Error) {
@@ -14,6 +15,47 @@ function nameSlideError(error, id) {
 	}
 	throw new Error(`Slide "${id}" could not be rendered: ${String(error)}`);
 }
+function firstNotesPages(pageOwners, slideCount) {
+	return Array.from({ length: slideCount }, (_, slide) => pageOwners.indexOf(slide));
+}
+async function placeRenderedImages(tab) {
+	const layers = tab.locator("[data-segnavia-image-layer]");
+	const styles = (await layers.evaluateAll((elements) => elements.map((element) => {
+		const layer = element;
+		const image = layer.querySelector("img");
+		return {
+			slide: {
+				width: Number(layer.dataset.slideWidth),
+				height: Number(layer.dataset.slideHeight)
+			},
+			image: {
+				width: image?.naturalWidth ?? 0,
+				height: image?.naturalHeight ?? 0
+			},
+			fit: layer.dataset.fit,
+			frame: layer.dataset.frame === "true"
+		};
+	}))).map((fact) => {
+		if (fact.image.width <= 0 || fact.image.height <= 0) return null;
+		const placement = fitImage(fact.slide, fact.image, fact.fit, void 0, fact.frame);
+		return imageLayerStyles(fact.image, placement, fact.slide);
+	});
+	await layers.evaluateAll((elements, values) => {
+		elements.forEach((element, index) => {
+			const styles = values[index];
+			if (!styles) return;
+			const layer = element;
+			const image = layer.querySelector("img");
+			if (!image) return;
+			Object.assign(layer.style, styles.layer);
+			Object.assign(image.style, styles.image);
+		});
+	}, styles);
+}
+async function paginateRenderedNotes(tab, maxSheets) {
+	if (maxSheets === void 0) return tab.evaluate(paginateNotes, null);
+	return tab.evaluate(`(${paginateNotes.toString()})(null,${JSON.stringify(maxSheets)})`);
+}
 async function regularDeckPdf(deck, opts, services) {
 	const htmlSlides = deck.slides.flatMap((slide, index) => slide.content.kind === "html" ? [{
 		index,
@@ -23,19 +65,27 @@ async function regularDeckPdf(deck, opts, services) {
 	const css = `${services.fontFaces(opts)}${opts.css ?? ""}`;
 	const slideCss = containFixedPageOverflow(css);
 	const notesGeometry = opts.layout === "notes" ? notesLayoutGeometry(deck.size, opts.notesPaper) : void 0;
+	let pageOwners = [];
 	const [printable, rendered] = await Promise.all([services.renderPdf({
 		viewport: notesGeometry ? {
 			width: Math.round(notesGeometry.sheet.width),
 			height: Math.round(notesGeometry.sheet.height)
 		} : deck.size,
-		scripts: deck.scripts === "sandboxed",
+		scripts: true,
 		html: printableDeck(deck, {
 			...opts,
 			css,
 			omitHtmlSlideFrames: true
 		}),
 		boundMs: opts.boundMs,
-		beforeOutput: opts.beforeOutput
+		beforeOutput: async (tab) => {
+			await placeRenderedImages(tab);
+			if (notesGeometry) {
+				if ((await paginateRenderedNotes(tab, opts.limits?.maxSheets)).exceeded) throw new RenderRefusedError(`The PDF needs more than ${opts.limits?.maxSheets} sheets; the limit is ${opts.limits?.maxSheets}.`);
+				pageOwners = await tab.locator(".sheet").evaluateAll((sheets) => sheets.map((sheet) => Number(sheet.dataset.slideIndex)));
+			}
+			await opts.beforeOutput?.(tab);
+		}
 	}, {
 		preferCSSPageSize: true,
 		printBackground: true
@@ -77,8 +127,10 @@ async function regularDeckPdf(deck, opts, services) {
 		height: deck.size.height
 	};
 	const geometry = pdfPixelBox(slideBox, notesGeometry?.sheet.height ?? deck.size.height);
+	const firstPages = notesGeometry ? firstNotesPages(pageOwners, deck.slides.length) : [];
 	for (const item of rendered) {
-		const sheet = pages[item.index];
+		const pageIndex = notesGeometry ? firstPages[item.index] ?? -1 : item.index;
+		const sheet = pages[pageIndex < 0 ? item.index : pageIndex];
 		if (!sheet) throw new Error(`The print document has no sheet for slide "${deck.slides[item.index]?.id ?? item.index}".`);
 		const embedded = await embedOnePage(output, item.bytes, `The rendered slide "${deck.slides[item.index]?.id ?? item.index}"`);
 		drawClippedPage(sheet, embedded, geometry, geometry);
@@ -107,9 +159,10 @@ async function imposedDeckPdf(deck, imposition, opts, services) {
 				index,
 				bytes: await services.renderPdf({
 					viewport: deck.size,
-					scripts: deck.scripts === "sandboxed",
+					scripts: slide.content.kind === "html" ? deck.scripts === "sandboxed" : true,
 					html,
-					boundMs: opts.boundMs
+					boundMs: opts.boundMs,
+					beforeOutput: slide.content.kind === "image" ? placeRenderedImages : void 0
 				}, {
 					width: `${deck.size.width}px`,
 					height: `${deck.size.height}px`,
@@ -151,4 +204,4 @@ async function renderDeckPdf(deck, opts, services) {
 	return imposedDeckPdf(deck, Imposition.parse(opts.imposition), opts, services);
 }
 //#endregion
-export { renderDeckPdf };
+export { firstNotesPages, renderDeckPdf };

package/dist/index.js

@@ -358,7 +358,7 @@ async function openRenderer(options) {
 			});
 			return withTab({
 				viewport: deck.size,
-				scripts: deck.scripts === "sandboxed",
+				scripts: true,
 				scale: opts.scale,
 				html,
 				waitForReady: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@segnavia/render",
-  "version": "0.7.0",
+  "version": "0.9.0",
   "type": "module",
   "license": "MIT",
   "repository": {
@@ -26,9 +26,9 @@
     }
   },
   "dependencies": {
-    "@segnavia/format": "0.7.0",
-    "@segnavia/frame": "0.7.0",
-    "@segnavia/html": "0.7.0",
+    "@segnavia/format": "0.9.0",
+    "@segnavia/frame": "0.9.0",
+    "@segnavia/html": "0.9.0",
     "playwright-core": "1.55.1",
     "pdf-lib": "^1.17.1"
   }