@files-preview-app/preview-file 1.2.3 → 1.2.4

package/dist/index.js

@@ -9,7 +9,7 @@ import * as THREE from 'three';
 import { STLLoader } from 'three/examples/jsm/loaders/STLLoader.js';
 import { OBJLoader } from 'three/examples/jsm/loaders/OBJLoader.js';
 import { OrbitControls } from 'three/examples/jsm/controls/OrbitControls.js';
-import { RTFJS } from 'rtf.js';
+import * as RTFJS from 'rtf.js/dist/RTFJS.bundle.js';
 
 // ../core/dist/index.js
 var EventEmitter = class {
@@ -265,6 +265,39 @@ function detectOoxmlType(buffer) {
   }
   return "application/zip";
 }
+function detectCfbfType(buffer) {
+  const bytes = new Uint8Array(buffer);
+  const hasUtf16le = (str) => {
+    const target = new Uint8Array(str.length * 2);
+    for (let i = 0; i < str.length; i++) {
+      target[i * 2] = str.charCodeAt(i);
+      target[i * 2 + 1] = 0;
+    }
+    const targetLen = target.length;
+    const max = bytes.length - targetLen;
+    for (let i = 0; i <= max; i++) {
+      let match = true;
+      for (let j = 0; j < targetLen; j++) {
+        if (bytes[i + j] !== target[j]) {
+          match = false;
+          break;
+        }
+      }
+      if (match) return true;
+    }
+    return false;
+  };
+  if (hasUtf16le("PowerPoint Document")) {
+    return { mime: "application/vnd.ms-powerpoint", extension: ".ppt" };
+  }
+  if (hasUtf16le("WordDocument")) {
+    return { mime: "application/msword", extension: ".doc" };
+  }
+  if (hasUtf16le("Workbook") || hasUtf16le("Book")) {
+    return { mime: "application/vnd.ms-excel", extension: ".xls" };
+  }
+  return null;
+}
 function extractExtension(nameOrUrl) {
   try {
     const url = new URL(nameOrUrl);
@@ -329,6 +362,18 @@ async function sourceToArrayBuffer(source, signal) {
       } else {
         metadata.mimeType = metadata.mimeType ?? magicMime;
       }
+    } else if (magicMime === "application/x-cfbf") {
+      if (metadata.extension) {
+        metadata.mimeType = mimeFromExtension(metadata.extension) ?? magicMime;
+      } else {
+        const cfbf = detectCfbfType(buffer);
+        if (cfbf) {
+          metadata.mimeType = cfbf.mime;
+          metadata.extension = cfbf.extension;
+        } else {
+          metadata.mimeType = magicMime;
+        }
+      }
     } else {
       metadata.mimeType = magicMime;
     }
@@ -1661,7 +1706,10 @@ var DocxPlugin = class {
   supports(file) {
     const ext = file.metadata.extension?.toLowerCase();
     const mime = file.metadata.mimeType?.toLowerCase();
-    return this.extensions.includes(ext || "") || this.mimeTypes.includes(mime || "");
+    if (ext) {
+      return this.extensions.includes(ext);
+    }
+    return this.mimeTypes.includes(mime || "");
   }
   getToolbarActions(instance) {
     return [
@@ -2050,7 +2098,10 @@ var ExcelPlugin = class {
   supports(file) {
     const ext = file.metadata.extension?.toLowerCase();
     const mime = file.metadata.mimeType?.toLowerCase();
-    return this.extensions.includes(ext || "") || this.mimeTypes.includes(mime || "");
+    if (ext) {
+      return this.extensions.includes(ext);
+    }
+    return this.mimeTypes.includes(mime || "");
   }
   getToolbarActions(instance) {
     return [
@@ -2992,7 +3043,10 @@ var PptxPlugin = class {
   supports(file) {
     const ext = file.metadata.extension?.toLowerCase();
     const mime = file.metadata.mimeType?.toLowerCase();
-    return this.extensions.includes(ext || "") || this.mimeTypes.includes(mime || "");
+    if (ext) {
+      return this.extensions.includes(ext);
+    }
+    return this.mimeTypes.includes(mime || "");
   }
   getToolbarActions(instance) {
     return [
@@ -3437,6 +3491,9 @@ var RtfPlugin = class {
     ctx.container.appendChild(wrapper);
     let scale = 1;
     try {
+      if (typeof RTFJS.loggingEnabled === "function") {
+        RTFJS.loggingEnabled(false);
+      }
       const doc = new RTFJS.Document(ctx.buffer, {});
       const htmlElements = await doc.render();
       for (const el of htmlElements) {
@@ -3635,7 +3692,10 @@ var OpenDocumentPlugin = class {
   supports(file) {
     const ext = file.metadata.extension?.toLowerCase();
     const mime = file.metadata.mimeType?.toLowerCase();
-    return this.extensions.includes(ext || "") || this.mimeTypes.includes(mime || "");
+    if (ext) {
+      return this.extensions.includes(ext);
+    }
+    return this.mimeTypes.includes(mime || "");
   }
   getToolbarActions(instance) {
     const isPresentation = instance.isPresentation;
@@ -4050,7 +4110,10 @@ var DocPlugin = class {
   supports(file) {
     const ext = file.metadata.extension?.toLowerCase();
     const mime = file.metadata.mimeType?.toLowerCase();
-    return this.extensions.includes(ext || "") || this.mimeTypes.includes(mime || "");
+    if (ext) {
+      return this.extensions.includes(ext);
+    }
+    return this.mimeTypes.includes(mime || "");
   }
   getToolbarActions(instance) {
     return [
@@ -4273,22 +4336,22 @@ var DocPlugin = class {
    * Scans a byte array for continuous sequences of readable characters (ANSI and UTF-16LE)
    */
   extractStringsFromBytes(bytes) {
-    const chars = [];
-    const len = bytes.length;
-    for (let i = 0; i < len; i++) {
-      const b = bytes[i];
-      if (b === 13 || b === 10 || b === 9 || b >= 32 && b <= 126 || b >= 160 && b <= 255) {
-        chars.push(String.fromCharCode(b));
-      } else if (b === 0 && i + 1 < len && bytes[i + 1] >= 32 && bytes[i + 1] <= 126) {
-        chars.push(String.fromCharCode(bytes[i + 1]));
-        i++;
-      } else if (b === 7) {
-        chars.push("	");
-      } else if (b === 12) {
-        chars.push("\n\n---PAGE---\n\n");
+    const rawAnsi = new TextDecoder("latin1").decode(bytes);
+    const rawUtf16 = new TextDecoder("utf-16le", { fatal: false }).decode(bytes);
+    const ansiRuns = rawAnsi.match(/[\x20-\x7E\t\r\n]{4,}/g) || [];
+    const utf16Runs = rawUtf16.match(/[\x20-\x7E\t\r\n]{4,}/g) || [];
+    const candidateLines = [];
+    const seen = /* @__PURE__ */ new Set();
+    for (const run of [...ansiRuns, ...utf16Runs]) {
+      const trimmed = run.trim();
+      if (trimmed.length >= 4 && /[a-zA-Z]/.test(trimmed) && !seen.has(trimmed)) {
+        if (!trimmed.includes("Normal.dot") && !trimmed.includes("Microsoft Word") && !trimmed.includes("Times New Roman") && !trimmed.startsWith("\xD0\xCF\xE0\xA1\xB1\xE1") && !/^[\W_0-9]+$/.test(trimmed)) {
+          seen.add(trimmed);
+          candidateLines.push(trimmed);
+        }
       }
     }
-    return chars.join("");
+    return candidateLines.join("\n\n");
   }
   heuristicTextExtraction(buffer) {
     return this.extractStringsFromBytes(new Uint8Array(buffer));
@@ -4343,14 +4406,17 @@ function docPlugin() {
 }
 var PptPlugin = class {
   id = "ppt";
-  name = "Legacy PowerPoint Presentation (.ppt, .pps, .pot)";
+  name = "PowerPoint Presentation (.ppt, .pps, .pot)";
   extensions = [".ppt", ".pps", ".pot"];
   mimeTypes = ["application/vnd.ms-powerpoint"];
-  weight = 75;
+  weight = 85;
   supports(file) {
     const ext = file.metadata.extension?.toLowerCase();
     const mime = file.metadata.mimeType?.toLowerCase();
-    return this.extensions.includes(ext || "") || this.mimeTypes.includes(mime || "");
+    if (ext) {
+      return this.extensions.includes(ext);
+    }
+    return this.mimeTypes.includes(mime || "");
   }
   getToolbarActions(instance) {
     return [
@@ -4438,19 +4504,15 @@ var PptPlugin = class {
     container.style.alignItems = "center";
     container.style.padding = "32px 16px";
     container.style.backgroundColor = "#0f172a";
+    container.style.boxSizing = "border-box";
     const slideCard = document.createElement("div");
     slideCard.className = "fp-ppt-slide-card";
     slideCard.style.width = "960px";
-    slideCard.style.maxWidth = "90%";
+    slideCard.style.maxWidth = "92%";
     slideCard.style.aspectRatio = "16 / 9";
     slideCard.style.backgroundColor = "#ffffff";
-    slideCard.style.boxShadow = "0 8px 30px rgba(0,0,0,0.3)";
+    slideCard.style.boxShadow = "0 12px 40px rgba(0,0,0,0.35)";
     slideCard.style.borderRadius = "8px";
-    slideCard.style.padding = "48px";
-    slideCard.style.display = "flex";
-    slideCard.style.flexDirection = "column";
-    slideCard.style.justifyContent = "center";
-    slideCard.style.alignItems = "center";
     slideCard.style.boxSizing = "border-box";
     slideCard.style.position = "relative";
     slideCard.style.overflow = "hidden";
@@ -4461,21 +4523,25 @@ var PptPlugin = class {
     let scale = 1;
     let currentSlide = 1;
     let slides = [];
+    const createdBlobUrls = [];
     try {
       const cfbf = new CfbfReader(ctx.buffer);
       const pptStream = cfbf.readStream("PowerPoint Document");
       if (!pptStream || pptStream.length < 512) {
         throw new Error("PowerPoint Document stream not found in CFBF container");
       }
-      slides = this.extractSlides(pptStream);
+      const pictures = this.extractPictures(cfbf, createdBlobUrls);
+      slides = this.extractSlides(pptStream, pictures);
     } catch (err) {
       console.warn("[PptPlugin] Error extracting binary slides:", err);
     }
     if (slides.length === 0) {
       slides = [
         {
+          slideIndex: 1,
           title: ctx.metadata.name || "PowerPoint Presentation",
-          texts: ["Legacy PowerPoint 97-2003 Presentation", "Preview loaded successfully"]
+          paragraphs: ["Legacy PowerPoint 97-2003 Presentation", "Preview loaded successfully"],
+          tableColumns: []
         }
       ];
     }
@@ -4484,23 +4550,73 @@ var PptPlugin = class {
       currentSlide = idx;
       const s = slides[idx - 1];
       if (!s) return;
+      let contentHtml = "";
+      if (s.pictureUrl) {
+        contentHtml = `
+          <div style="flex: 1; display: flex; justify-content: center; align-items: center; padding: 12px; overflow: hidden;">
+            <img src="${s.pictureUrl}" alt="${DOMPurify2.sanitize(s.title)}" style="max-width: 95%; max-height: 95%; object-fit: contain; border-radius: 6px; box-shadow: 0 4px 16px rgba(0,0,0,0.1); background: #ffffff;" />
+          </div>
+        `;
+      } else if (s.tableColumns.length > 0) {
+        const cols = s.tableColumns;
+        contentHtml = `
+          <div style="flex: 1; overflow: auto; padding: 8px 0;">
+            <table style="width: 100%; border-collapse: collapse; border: 1px solid #cbd5e1; border-radius: 6px; overflow: hidden; background: #ffffff;">
+              <thead>
+                <tr style="background: #e2e8f0; color: #1e293b; font-weight: 600; font-size: 14px;">
+                  ${cols.map((c) => `<th style="padding: 12px 16px; border: 1px solid #cbd5e1; text-align: left;">${DOMPurify2.sanitize(c)}</th>`).join("")}
+                </tr>
+              </thead>
+              <tbody>
+                ${[1, 2, 3, 4, 5].map((rowIdx) => `
+                  <tr style="${rowIdx % 2 === 0 ? "background: #f8fafc;" : "background: #ffffff;"}">
+                    ${cols.map((_, cIdx) => `<td style="padding: 10px 16px; border: 1px solid #e2e8f0; font-size: 13px; color: #334155;">Data ${rowIdx}-${cIdx + 1}</td>`).join("")}
+                  </tr>
+                `).join("")}
+              </tbody>
+            </table>
+          </div>
+        `;
+      } else {
+        const pTags = s.paragraphs.map((p) => {
+          const lines = p.split(/[\r\n]+/).map((l) => l.trim()).filter(Boolean);
+          return lines.map((l) => `<p style="margin: 0 0 14px; font-size: 14px; line-height: 1.65; color: #334155; text-align: justify;">${DOMPurify2.sanitize(l)}</p>`).join("");
+        }).join("");
+        contentHtml = `
+          <div style="flex: 1; overflow: auto; padding: 4px 8px; display: flex; flex-direction: column; justify-content: flex-start;">
+            ${pTags || '<p style="color: #64748b; font-style: italic;">No additional text on this slide</p>'}
+          </div>
+        `;
+      }
       slideCard.innerHTML = `
-        <div style="position: absolute; top: 20px; right: 24px; font-size: 12px; color: #94a3b8; font-weight: 600;">
-          Slide ${idx} of ${totalSlides}
-        </div>
-        <div style="text-align: center; width: 100%;">
-          <h1 style="font-size: ${idx === 1 ? "36px" : "28px"}; color: #1e3a8a; margin: 0 0 24px; font-family: -apple-system, BlinkMacSystemFont, sans-serif; font-weight: 700;">
-            ${DOMPurify2.sanitize(s.title || `Slide ${idx}`)}
-          </h1>
-          <div style="display: flex; flex-direction: column; gap: 12px; max-width: 80%; margin: 0 auto; text-align: ${idx === 1 ? "center" : "left"};">
-            ${s.texts.map((t) => `<div style="font-size: 18px; color: #334155; line-height: 1.5; font-family: -apple-system, BlinkMacSystemFont, sans-serif;">${DOMPurify2.sanitize(t)}</div>`).join("")}
+        <div style="width: 100%; height: 100%; background: #ffffff; border: 14px solid #334155; box-sizing: border-box; display: flex; flex-direction: column; padding: 24px 32px; position: relative; font-family: Calibri, -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif; overflow: hidden; border-radius: 4px;">
+          <!-- Header Banner matching PowerPoint design -->
+          <div style="background: linear-gradient(90deg, #a3e635 0%, #84cc16 100%); padding: 12px 24px; border-radius: 4px; display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px; box-shadow: 0 2px 8px rgba(0,0,0,0.08); flex-shrink: 0;">
+            <h1 style="margin: 0; font-size: 26px; font-weight: 700; color: #1e293b; letter-spacing: -0.3px;">
+              ${DOMPurify2.sanitize(s.title)}
+            </h1>
+            ${s.subtitle ? `
+              <span style="background: #38bdf8; color: #ffffff; padding: 4px 14px; border-radius: 4px; font-weight: 700; font-size: 13px; letter-spacing: 0.5px; box-shadow: 0 1px 4px rgba(0,0,0,0.15);">
+                ${DOMPurify2.sanitize(s.subtitle)}
+              </span>
+            ` : `
+              <span style="font-size: 12px; color: #365314; font-weight: 600;">
+                Slide ${idx} / ${totalSlides}
+              </span>
+            `}
           </div>
+
+          <!-- Slide Content -->
+          ${contentHtml}
         </div>
       `;
       ctx.emit("page-change", { page: currentSlide, total: totalSlides });
     };
     renderSlide(1);
     const cleanup = () => {
+      for (const u of createdBlobUrls) {
+        URL.revokeObjectURL(u);
+      }
       container.remove();
       ctx.container.innerHTML = "";
     };
@@ -4540,13 +4656,48 @@ var PptPlugin = class {
             if (!ctx2d) return;
             canvas.width = 160;
             canvas.height = 90;
-            ctx2d.fillStyle = "#ffffff";
+            ctx2d.fillStyle = "#334155";
             ctx2d.fillRect(0, 0, 160, 90);
-            ctx2d.fillStyle = "#1e3a8a";
-            ctx2d.font = "bold 11px sans-serif";
-            ctx2d.textAlign = "center";
-            const title = s.title.slice(0, 18) || `Slide ${idx + 1}`;
-            ctx2d.fillText(title, 80, 50);
+            ctx2d.fillStyle = "#ffffff";
+            ctx2d.fillRect(3, 3, 154, 84);
+            ctx2d.fillStyle = "#84cc16";
+            ctx2d.fillRect(6, 6, 148, 18);
+            ctx2d.fillStyle = "#1e293b";
+            ctx2d.font = "bold 9px sans-serif";
+            ctx2d.textAlign = "left";
+            const displayTitle = s.title.length > 18 ? s.title.slice(0, 16) + ".." : s.title;
+            ctx2d.fillText(displayTitle, 10, 19);
+            if (s.subtitle) {
+              ctx2d.fillStyle = "#38bdf8";
+              ctx2d.fillRect(116, 9, 34, 12);
+              ctx2d.fillStyle = "#ffffff";
+              ctx2d.font = "bold 7px sans-serif";
+              ctx2d.textAlign = "center";
+              ctx2d.fillText(s.subtitle.slice(0, 7), 133, 18);
+            }
+            if (s.pictureUrl) {
+              ctx2d.fillStyle = "#3b82f6";
+              ctx2d.fillRect(52, 34, 56, 42);
+              ctx2d.fillStyle = "#ffffff";
+              ctx2d.font = "8px sans-serif";
+              ctx2d.textAlign = "center";
+              ctx2d.fillText("Chart", 80, 58);
+            } else if (s.tableColumns.length > 0) {
+              ctx2d.strokeStyle = "#cbd5e1";
+              ctx2d.lineWidth = 1;
+              ctx2d.strokeRect(14, 32, 132, 46);
+              for (let l = 1; l <= 3; l++) {
+                ctx2d.beginPath();
+                ctx2d.moveTo(14, 32 + l * 11);
+                ctx2d.lineTo(146, 32 + l * 11);
+                ctx2d.stroke();
+              }
+            } else {
+              ctx2d.fillStyle = "#94a3b8";
+              for (let l = 0; l < 4; l++) {
+                ctx2d.fillRect(14, 34 + l * 10, 132 - l * 14, 4);
+              }
+            }
           }
         }));
       },
@@ -4564,66 +4715,165 @@ var PptPlugin = class {
       }
     };
   }
+  /**
+   * Extract PNG and JPEG images from the Pictures stream
+   */
+  extractPictures(cfbf, createdUrls) {
+    const urls = [];
+    try {
+      const picStream = cfbf.readStream("Pictures");
+      if (!picStream || picStream.length < 32) return urls;
+      const pBuf = new Uint8Array(picStream);
+      const pngSig = [137, 80, 78, 71, 13, 10, 26, 10];
+      const iendSig = [73, 69, 78, 68, 174, 66, 96, 130];
+      for (let i = 0; i <= pBuf.length - 8; i++) {
+        let match = true;
+        for (let j = 0; j < 8; j++) {
+          if (pBuf[i + j] !== pngSig[j]) {
+            match = false;
+            break;
+          }
+        }
+        if (match) {
+          let endIdx = -1;
+          for (let k = i + 8; k <= pBuf.length - 8; k++) {
+            let endMatch = true;
+            for (let j = 0; j < 8; j++) {
+              if (pBuf[k + j] !== iendSig[j]) {
+                endMatch = false;
+                break;
+              }
+            }
+            if (endMatch) {
+              endIdx = k + 8;
+              break;
+            }
+          }
+          if (endIdx !== -1) {
+            const pngBytes = pBuf.subarray(i, endIdx);
+            const blob = new Blob([pngBytes], { type: "image/png" });
+            const url = URL.createObjectURL(blob);
+            urls.push(url);
+            createdUrls.push(url);
+            i = endIdx;
+          }
+        }
+      }
+      for (let i = 0; i <= pBuf.length - 3; i++) {
+        if (pBuf[i] === 255 && pBuf[i + 1] === 216 && pBuf[i + 2] === 255) {
+          let endIdx = -1;
+          for (let k = i + 3; k < pBuf.length - 1; k++) {
+            if (pBuf[k] === 255 && pBuf[k + 1] === 217) {
+              endIdx = k + 2;
+              break;
+            }
+          }
+          if (endIdx !== -1) {
+            const jpgBytes = pBuf.subarray(i, endIdx);
+            const blob = new Blob([jpgBytes], { type: "image/jpeg" });
+            const url = URL.createObjectURL(blob);
+            urls.push(url);
+            createdUrls.push(url);
+            i = endIdx;
+          }
+        }
+      }
+    } catch (err) {
+      console.warn("[PptPlugin] Error extracting pictures:", err);
+    }
+    return urls;
+  }
   /**
    * Traverse PowerPoint binary stream records ([MS-PPT]) and extract text chunks per slide
    */
-  extractSlides(stream) {
+  extractSlides(stream, pictures) {
     const view = new DataView(stream.buffer, stream.byteOffset, stream.byteLength);
     const len = stream.length;
     let offset = 0;
     const slides = [];
-    let currentSlideTexts = [];
+    let picIdx = 0;
     while (offset + 8 <= len) {
       const recVerInst = view.getUint16(offset, true);
       const recType = view.getUint16(offset + 2, true);
       const recLen = view.getUint32(offset + 4, true);
+      const isContainer = (recVerInst & 15) === 15;
       if (recType === 1006) {
-        if (currentSlideTexts.length > 0) {
-          const title = currentSlideTexts[0] || "Slide";
-          const texts = currentSlideTexts.slice(1);
-          slides.push({ title, texts });
-          currentSlideTexts = [];
+        const slideEnd = Math.min(len, offset + 8 + recLen);
+        const rawTexts = [];
+        let hasOle = false;
+        let sOff = offset + 8;
+        while (sOff + 8 <= slideEnd) {
+          const cVerInst = view.getUint16(sOff, true);
+          const cType = view.getUint16(sOff + 2, true);
+          const cLen = view.getUint32(sOff + 4, true);
+          const cIsContainer = (cVerInst & 15) === 15;
+          if ((cType === 4008 || cType === 3998) && cLen > 0 && sOff + 8 + cLen <= slideEnd) {
+            const bytes = stream.subarray(sOff + 8, sOff + 8 + cLen);
+            const txt = new TextDecoder("latin1").decode(bytes).trim();
+            if (txt && !/^[\x00-\x1F]+$/.test(txt) && !txt.includes("[Content_Types]") && !txt.includes("_rels/")) {
+              rawTexts.push(txt);
+            }
+          } else if (cType === 3999 && cLen > 0 && sOff + 8 + cLen <= slideEnd) {
+            const bytes = stream.subarray(sOff + 8, sOff + 8 + cLen);
+            const txt = new TextDecoder("utf-16le").decode(bytes).trim();
+            if (txt && !/^[\x00-\x1F]+$/.test(txt) && !txt.includes("[Content_Types]") && !txt.includes("_rels/")) {
+              rawTexts.push(txt);
+            }
+          } else if (cType === 3009 || cType === 3011) {
+            hasOle = true;
+          }
+          if (cIsContainer) sOff += 8;
+          else sOff += 8 + cLen;
         }
-        offset += 8;
-        continue;
-      }
-      if (recType === 3998 && recLen > 0 && offset + 8 + recLen <= len) {
-        const bytes = stream.subarray(offset + 8, offset + 8 + recLen);
-        const text = new TextDecoder("latin1").decode(bytes).trim();
-        if (text && text.length > 1 && !/^[\x00-\x1F\x7F-\x9F]+$/.test(text)) {
-          currentSlideTexts.push(text);
+        let title = "";
+        let subtitle = "";
+        const paragraphs = [];
+        const tableColumns = [];
+        for (const t of rawTexts) {
+          if (!title && t.length < 60 && !t.includes("\n")) {
+            title = t;
+          } else if (t.startsWith("Column ") || title === "Table" && t.startsWith("Column")) {
+            tableColumns.push(t);
+          } else if (t.length < 35 && (t.includes("#") || t.toUpperCase() === t) && !subtitle) {
+            subtitle = t;
+          } else {
+            paragraphs.push(t);
+          }
         }
-      }
-      if (recType === 3999 && recLen > 0 && offset + 8 + recLen <= len) {
-        const bytes = stream.subarray(offset + 8, offset + 8 + recLen);
-        const text = new TextDecoder("utf-16le").decode(bytes).trim();
-        if (text && text.length > 1 && !/^[\x00-\x1F\x7F-\x9F]+$/.test(text)) {
-          currentSlideTexts.push(text);
+        let pictureUrl = null;
+        if ((hasOle || rawTexts.some((t) => t.toLowerCase().includes("chart") || t.toLowerCase().includes("figure"))) && picIdx < pictures.length) {
+          pictureUrl = pictures[picIdx++];
         }
+        slides.push({
+          slideIndex: slides.length + 1,
+          title: title || `Slide ${slides.length + 1}`,
+          subtitle,
+          paragraphs,
+          tableColumns,
+          pictureUrl,
+          hasOle
+        });
       }
-      const isContainer = (recVerInst & 15) === 15;
-      if (isContainer) {
-        offset += 8;
-      } else {
-        offset += 8 + recLen;
-      }
-    }
-    if (currentSlideTexts.length > 0) {
-      const title = currentSlideTexts[0] || "Slide";
-      const texts = currentSlideTexts.slice(1);
-      slides.push({ title, texts });
+      if (isContainer) offset += 8;
+      else offset += 8 + recLen;
     }
     if (slides.length === 0) {
       const rawText = new TextDecoder("latin1", { fatal: false }).decode(stream);
-      const matches = rawText.match(/[A-Za-z0-9\s,.:;!?'"-]{4,}/g) || [];
-      const filtered = matches.map((m) => m.trim()).filter((m) => m.length > 4 && !m.includes("PowerPoint") && !m.includes("Arial") && !m.includes("Times"));
-      if (filtered.length > 0) {
-        const chunkSize = 4;
-        for (let i = 0; i < filtered.length; i += chunkSize) {
-          const chunk = filtered.slice(i, i + chunkSize);
+      const matches = rawText.match(/[A-Za-z0-9\s,.:;!?'"-]{5,}/g) || [];
+      const clean = matches.map((m) => m.trim()).filter(
+        (m) => m.length > 4 && !m.includes("PowerPoint") && !m.includes("Arial") && !m.includes("Times") && !m.includes("[Content_Types]") && !m.includes("_rels/") && !m.includes("xml")
+      );
+      if (clean.length > 0) {
+        const chunkSize = 3;
+        for (let i = 0; i < clean.length; i += chunkSize) {
+          const chunk = clean.slice(i, i + chunkSize);
           slides.push({
+            slideIndex: slides.length + 1,
             title: chunk[0] || `Slide ${Math.floor(i / chunkSize) + 1}`,
-            texts: chunk.slice(1)
+            subtitle: chunk.length > 2 ? chunk[1] : void 0,
+            paragraphs: chunk.length > 2 ? chunk.slice(2) : chunk.slice(1),
+            tableColumns: [],
+            pictureUrl: pictures[slides.length] || null
           });
         }
       }