pptx-browser 4.1.3 → 4.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pptx-browser",
-  "version": "4.1.3",
+  "version": "4.1.5",
   "description": "Render, edit, and export PowerPoint (PPTX) slides. Canvas rendering, SVG export, PDF export, PPTX writer/template engine, slide show, text extraction, animations. Zero dependencies.",
   "type": "module",
   "main": "./src/index.js",

package/src/pdf.js

@@ -62,6 +62,12 @@ class PdfBuf {
 
 /** Extract raw JPEG bytes from a canvas element. Returns Uint8Array. */
 async function canvasToJpeg(canvas, quality = 0.92) {
+  // OffscreenCanvas uses convertToBlob(); HTMLCanvasElement uses toBlob()
+  if (typeof canvas.convertToBlob === 'function') {
+    const blob = await canvas.convertToBlob({ type: 'image/jpeg', quality });
+    const buf = await blob.arrayBuffer();
+    return new Uint8Array(buf);
+  }
   return new Promise((resolve, reject) => {
     canvas.toBlob(blob => {
       if (!blob) { reject(new Error('canvas.toBlob failed')); return; }

package/src/svg.js

@@ -459,15 +459,15 @@ function toRoman(n) {
 }
 
 // ── Shape → SVG ───────────────────────────────────────────────────────────────
-async function shapesToSvg(spTreeEl, rels, imageCache, themeColors, themeData, defs) {
+async function shapesToSvg(spTreeEl, rels, files, themeColors, themeData, defs) {
   if (!spTreeEl) return '';
   let out = '';
   for (const child of spTreeEl.children) {
     const ln = child.localName;
     if (ln === 'sp')           out += await shapeToSvg(child, themeColors, themeData, defs);
-    else if (ln === 'pic')     out += await pictureToSvg(child, rels, imageCache, themeColors, defs);
+    else if (ln === 'pic')     out += await pictureToSvg(child, rels, files, themeColors, defs);
     else if (ln === 'cxnSp')  out += await connectorToSvg(child, themeColors, defs);
-    else if (ln === 'grpSp')  out += await groupToSvg(child, rels, imageCache, themeColors, themeData, defs);
+    else if (ln === 'grpSp')  out += await groupToSvg(child, rels, files, themeColors, themeData, defs);
     else if (ln === 'graphicFrame') out += await graphicFrameToSvg(child, themeColors, defs);
   }
   return out;
@@ -543,7 +543,7 @@ async function shapeToSvg(spEl, themeColors, themeData, defs) {
   return `<g>${pathSvg}${textSvg}</g>`;
 }
 
-async function pictureToSvg(picEl, rels, imageCache, themeColors, defs) {
+async function pictureToSvg(picEl, rels, files, themeColors, defs) {
   const spPr = g1(picEl, 'spPr');
   const xfrm = g1(spPr, 'xfrm');
   const b    = xfrmBounds(xfrm);
@@ -553,7 +553,7 @@ async function pictureToSvg(picEl, rels, imageCache, themeColors, defs) {
   const blip     = blipFill ? g1(blipFill, 'blip') : null;
   const rId      = blip ? (blip.getAttribute('r:embed') || blip.getAttribute('embed')) : null;
   const rel      = rId ? rels[rId] : null;
-  const imgData  = rel ? imageCache[rel.fullPath] : null;
+  const imgData  = rel ? files[rel.fullPath] : null;
 
   const transform = xfrmAttrs(xfrm);
   const effectLst = g1(spPr, 'effectLst');
@@ -567,7 +567,8 @@ async function pictureToSvg(picEl, rels, imageCache, themeColors, defs) {
   const ext  = rel.fullPath.split('.').pop().toLowerCase();
   const mime = ext === 'png' ? 'image/png' : ext === 'gif' ? 'image/gif'
     : ext === 'svg' ? 'image/svg+xml' : 'image/jpeg';
-  const b64  = btoa(String.fromCharCode(...(imgData instanceof Uint8Array ? imgData : new Uint8Array(imgData))));
+  const raw  = imgData instanceof Uint8Array ? imgData : new Uint8Array(imgData);
+  const b64  = btoa(Array.from(raw, b => String.fromCharCode(b)).join(''));
 
   // Clip to shape bounds
   const clipId = uid('pic');
@@ -587,12 +588,12 @@ async function connectorToSvg(cxnSpEl, themeColors, defs) {
   return `<line x1="${px(b.x)}" y1="${px(b.y)}" x2="${px(b.x+b.w)}" y2="${px(b.y+b.h)}" fill="none"${stroke}${transform}/>`;
 }
 
-async function groupToSvg(grpSpEl, rels, imageCache, themeColors, themeData, defs) {
+async function groupToSvg(grpSpEl, rels, files, themeColors, themeData, defs) {
   const spPr = g1(grpSpEl, 'grpSpPr');
   const xfrm = g1(spPr, 'xfrm');
   const b    = xfrmBounds(xfrm);
   const transform = xfrm ? xfrmAttrs(xfrm) : '';
-  const children = await shapesToSvg(grpSpEl, rels, imageCache, themeColors, themeData, defs);
+  const children = await shapesToSvg(grpSpEl, rels, files, themeColors, themeData, defs);
   return `<g${transform}>${children}</g>`;
 }
 
@@ -606,7 +607,7 @@ async function graphicFrameToSvg(graphicFrame, themeColors, defs) {
 }
 
 // ── Background → SVG ──────────────────────────────────────────────────────────
-async function backgroundToSvg(slideDoc, masterDoc, layoutDoc, imageCache, masterRels, themeColors, slideW, slideH, defs) {
+async function backgroundToSvg(slideDoc, masterDoc, layoutDoc, files, masterRels, themeColors, slideW, slideH, defs) {
   const getbg = (doc) => {
     const cSld = g1(doc, 'cSld');
     const bg   = cSld ? g1(cSld, 'bg') : null;
@@ -626,11 +627,12 @@ async function backgroundToSvg(slideDoc, masterDoc, layoutDoc, imageCache, maste
           const blip = g1(fillEl, 'blip');
           const rId  = blip ? (blip.getAttribute('r:embed') || blip.getAttribute('embed')) : null;
           const rel  = rId && masterRels ? masterRels[rId] : null;
-          const imgData = rel ? imageCache[rel.fullPath] : null;
+          const imgData = rel ? files[rel.fullPath] : null;
           if (imgData) {
             const ext  = rel.fullPath.split('.').pop().toLowerCase();
             const mime = ext === 'png' ? 'image/png' : 'image/jpeg';
-            const b64  = btoa(String.fromCharCode(...new Uint8Array(imgData)));
+            const raw  = imgData instanceof Uint8Array ? imgData : new Uint8Array(imgData);
+            const b64  = btoa(Array.from(raw, b => String.fromCharCode(b)).join(''));
             return `<image width="${px(slideW)}" height="${px(slideH)}" href="data:${mime};base64,${b64}" preserveAspectRatio="xMidYMid slice"/>`;
           }
         }
@@ -658,7 +660,7 @@ async function backgroundToSvg(slideDoc, masterDoc, layoutDoc, imageCache, maste
  */
 export async function renderSlideToSvg(slideIndex, renderer) {
   const { _files: files, slidePaths, slideSize, themeColors, themeData,
-          masterDoc, masterRels, masterImages } = renderer;
+          masterDoc, masterRels } = renderer;
 
   if (slideIndex < 0 || slideIndex >= slidePaths.length) throw new Error('Slide index out of range');
 
@@ -675,12 +677,6 @@ export async function renderSlideToSvg(slideIndex, renderer) {
     ? parseXml(new TextDecoder().decode(files[layoutRel.fullPath])) : null;
   const layoutRels = layoutRel ? await getRels(files, layoutRel.fullPath) : {};
 
-  // Image cache
-  const { loadImages } = await import('./render.js');
-  const slideImages  = await loadImages(files, slideRels);
-  const layoutImages = layoutRel ? await loadImages(files, layoutRels) : {};
-  const allImages    = { ...masterImages, ...layoutImages, ...slideImages };
-
   // Slide dimensions in px (96 dpi)
   const W = slideSize.cx / 914400 * 96;
   const H = slideSize.cy / 914400 * 96;
@@ -688,7 +684,7 @@ export async function renderSlideToSvg(slideIndex, renderer) {
   const defs = [];
 
   // Background
-  const bgSvg = await backgroundToSvg(slideDoc, masterDoc, layoutDoc, allImages,
+  const bgSvg = await backgroundToSvg(slideDoc, masterDoc, layoutDoc, files,
     masterRels, themeColors, W, H, defs);
 
   // Master / layout decorative shapes
@@ -697,11 +693,11 @@ export async function renderSlideToSvg(slideIndex, renderer) {
   const slideTree  = g1(g1(slideDoc, 'cSld'), 'spTree');
 
   const masterSvg = masterTree
-    ? await shapesToSvg(masterTree, masterRels, masterImages, themeColors, themeData, defs) : '';
+    ? await shapesToSvg(masterTree, masterRels, files, themeColors, themeData, defs) : '';
   const layoutSvg = layoutTree
-    ? await shapesToSvg(layoutTree, layoutRels, layoutImages, themeColors, themeData, defs) : '';
+    ? await shapesToSvg(layoutTree, layoutRels, files, themeColors, themeData, defs) : '';
   const slideSvg  = slideTree
-    ? await shapesToSvg(slideTree, slideRels, allImages, themeColors, themeData, defs) : '';
+    ? await shapesToSvg(slideTree, slideRels, files, themeColors, themeData, defs) : '';
 
   const defsBlock = defs.length ? `<defs>${defs.join('\n')}</defs>` : '';