unpdf 1.6.2 → 1.7.0

package/dist/index.mjs

@@ -55,7 +55,9 @@ async function getDocumentProxy(data, options = {}) {
       const base = import.meta.resolve("pdfjs-dist/package.json");
       nodeDefaults = {
         disableFontFace: true,
-        standardFontDataUrl: new URL("./standard_fonts/", base).href
+        standardFontDataUrl: new URL("./standard_fonts/", base).href,
+        cMapUrl: new URL("./cmaps/", base).href,
+        cMapPacked: true
       };
     } catch {
     }
@@ -70,6 +72,15 @@ async function getDocumentProxy(data, options = {}) {
   }).promise;
   return pdf;
 }
+async function withDocument(data, operation, options) {
+  const pdf = isPDFDocumentProxy(data) ? data : await getDocumentProxy(data, options);
+  try {
+    return await operation(pdf);
+  } finally {
+    if (pdf !== data)
+      await pdf.destroy();
+  }
+}
 async function getResolvedPDFJS() {
   if (!resolvedModule) {
     await resolvePDFJSImport();
@@ -175,6 +186,7 @@ class NodeCanvasFactory extends BaseCanvasFactory {
 }
 async function resolveCanvasModule(canvasImport) {
   resolvedCanvasModule ??= await interopDefault(canvasImport());
+  globalThis[Symbol.for("unpdf.canvasModule")] = resolvedCanvasModule;
 }
 function injectCanvasConstructors() {
   if (!resolvedCanvasModule)
@@ -187,69 +199,85 @@ function injectCanvasConstructors() {
 }
 
 async function extractImages$1(data, pageNumber) {
-  const pdf = isPDFDocumentProxy(data) ? data : await getDocumentProxy(data);
-  if (pageNumber < 1 || pageNumber > pdf.numPages) {
-    throw new Error(`Invalid page number. Must be between 1 and ${pdf.numPages}.`);
-  }
-  const page = await pdf.getPage(pageNumber);
-  const operatorList = await page.getOperatorList();
-  const { OPS } = await getResolvedPDFJS();
-  const images = [];
-  for (let i = 0; i < operatorList.fnArray.length; i++) {
-    const op = operatorList.fnArray[i];
-    if (op !== OPS.paintImageXObject) {
-      continue;
-    }
-    const imageKey = operatorList.argsArray[i][0];
-    const image = await new Promise(
-      (resolve) => (imageKey.startsWith("g_") ? page.commonObjs : page.objs).get(imageKey, resolve)
-    );
-    if (!image || !image.data || !image.width || !image.height) {
-      continue;
+  return await withDocument(data, async (pdf) => {
+    if (pageNumber < 1 || pageNumber > pdf.numPages) {
+      throw new Error(`Invalid page number. Must be between 1 and ${pdf.numPages}.`);
     }
-    const { width, height, data: data2 } = image;
-    const calculatedChannels = data2.length / (width * height);
-    if (![1, 3, 4].includes(calculatedChannels)) {
-      continue;
+    const page = await pdf.getPage(pageNumber);
+    const operatorList = await page.getOperatorList();
+    const { OPS } = await getResolvedPDFJS();
+    const images = [];
+    for (let i = 0; i < operatorList.fnArray.length; i++) {
+      const op = operatorList.fnArray[i];
+      if (op !== OPS.paintImageXObject) {
+        continue;
+      }
+      const imageKey = operatorList.argsArray[i][0];
+      const image = await new Promise(
+        (resolve) => (imageKey.startsWith("g_") ? page.commonObjs : page.objs).get(imageKey, resolve)
+      );
+      if (!image || !image.data || !image.width || !image.height) {
+        continue;
+      }
+      const { width, height, data: data2 } = image;
+      const calculatedChannels = data2.length / (width * height);
+      if (![1, 3, 4].includes(calculatedChannels)) {
+        continue;
+      }
+      const channels = calculatedChannels;
+      images.push({
+        data: data2,
+        width,
+        height,
+        channels,
+        key: imageKey
+      });
     }
-    const channels = calculatedChannels;
-    images.push({
-      data: data2,
-      width,
-      height,
-      channels,
-      key: imageKey
-    });
-  }
-  return images;
+    return images;
+  });
 }
 async function renderPageAsImage$1(data, pageNumber, options = {}) {
   const CanvasFactory = await createIsomorphicCanvasFactory(options.canvasImport);
-  const pdf = isPDFDocumentProxy(data) ? data : await getDocumentProxy(data, { CanvasFactory });
-  const page = await pdf.getPage(pageNumber);
-  if (pageNumber < 1 || pageNumber > pdf.numPages) {
-    throw new Error(`Invalid page number. Must be between 1 and ${pdf.numPages}.`);
-  }
-  const defaultViewport = page.getViewport({ scale: 1 });
-  let scale = options.scale || 1;
-  if (options.width) {
-    scale = options.width / defaultViewport.width;
-  } else if (options.height) {
-    scale = options.height / defaultViewport.height;
-  }
-  const viewport = page.getViewport({ scale: Math.max(0, scale) });
-  const drawingContext = new CanvasFactory().create(viewport.width, viewport.height);
-  await page.render({
-    canvas: drawingContext.canvas,
-    canvasContext: drawingContext.context,
-    viewport
-  }).promise;
-  const dataUrl = drawingContext.canvas.toDataURL();
-  if (options.toDataURL) {
-    return dataUrl;
-  }
-  const response = await fetch(dataUrl);
-  return await response.arrayBuffer();
+  return await withDocument(data, async (pdf) => {
+    if (pageNumber < 1 || pageNumber > pdf.numPages) {
+      throw new Error(`Invalid page number. Must be between 1 and ${pdf.numPages}.`);
+    }
+    const page = await pdf.getPage(pageNumber);
+    const defaultViewport = page.getViewport({ scale: 1 });
+    let scale = options.scale || 1;
+    if (options.width) {
+      scale = options.width / defaultViewport.width;
+    } else if (options.height) {
+      scale = options.height / defaultViewport.height;
+    }
+    const viewport = page.getViewport({ scale: Math.max(0, scale) });
+    const canvasFactory = new CanvasFactory();
+    const drawingContext = canvasFactory.create(viewport.width, viewport.height);
+    try {
+      await page.render({
+        canvas: drawingContext.canvas,
+        canvasContext: drawingContext.context,
+        viewport
+      }).promise;
+      const { canvas } = drawingContext;
+      if (options.toDataURL) {
+        return canvas.toDataURL();
+      }
+      if ("encode" in canvas) {
+        const buffer = await canvas.encode("png");
+        return buffer.buffer.slice(buffer.byteOffset, buffer.byteOffset + buffer.byteLength);
+      }
+      const blob = await new Promise((resolve) => {
+        canvas.toBlob(resolve);
+      });
+      if (!blob) {
+        throw new Error("Failed to encode canvas to a PNG blob.");
+      }
+      return await blob.arrayBuffer();
+    } finally {
+      canvasFactory.destroy(drawingContext);
+    }
+  }, { CanvasFactory });
 }
 async function createIsomorphicCanvasFactory(canvasImport) {
   if (isBrowser)
@@ -266,14 +294,15 @@ async function createIsomorphicCanvasFactory(canvasImport) {
 }
 
 async function extractLinks$1(data) {
-  const pdf = isPDFDocumentProxy(data) ? data : await getDocumentProxy(data);
-  const pageLinks = await Promise.all(
-    Array.from({ length: pdf.numPages }, (_, i) => getPageLinks(pdf, i + 1))
-  );
-  return {
-    totalPages: pdf.numPages,
-    links: pageLinks.flat()
-  };
+  return await withDocument(data, async (pdf) => {
+    const pageLinks = await Promise.all(
+      Array.from({ length: pdf.numPages }, (_, i) => getPageLinks(pdf, i + 1))
+    );
+    return {
+      totalPages: pdf.numPages,
+      links: pageLinks.flat()
+    };
+  });
 }
 async function getPageLinks(document, pageNumber) {
   const page = await document.getPage(pageNumber);
@@ -296,38 +325,39 @@ const XMP_DATE_PROPERTIES = [
   "xap:metadatadate"
 ];
 async function getMeta$1(data, options = {}) {
-  const pdf = isPDFDocumentProxy(data) ? data : await getDocumentProxy(data);
-  const meta = await pdf.getMetadata();
-  const info = meta?.info || {};
-  if (options.parseDates) {
-    const { PDFDateString } = await getResolvedPDFJS();
-    if (info?.CreationDate) {
-      info.CreationDate = PDFDateString.toDateObject(info?.CreationDate);
-    }
-    if (info?.ModDate) {
-      info.ModDate = PDFDateString.toDateObject(info?.ModDate);
-    }
-    if (meta.metadata) {
-      meta.metadata = new Proxy(meta.metadata, {
-        get(target, prop) {
-          if (prop === "get") {
-            return (name) => {
-              const value = target.get(name);
-              if (XMP_DATE_PROPERTIES.includes(name) && value) {
-                return parseISODateString(value);
-              }
-              return value;
-            };
+  return await withDocument(data, async (pdf) => {
+    const meta = await pdf.getMetadata();
+    const info = meta?.info || {};
+    if (options.parseDates) {
+      const { PDFDateString } = await getResolvedPDFJS();
+      if (info?.CreationDate) {
+        info.CreationDate = PDFDateString.toDateObject(info?.CreationDate);
+      }
+      if (info?.ModDate) {
+        info.ModDate = PDFDateString.toDateObject(info?.ModDate);
+      }
+      if (meta.metadata) {
+        meta.metadata = new Proxy(meta.metadata, {
+          get(target, prop) {
+            if (prop === "get") {
+              return (name) => {
+                const value = target.get(name);
+                if (XMP_DATE_PROPERTIES.includes(name) && value) {
+                  return parseISODateString(value);
+                }
+                return value;
+              };
+            }
+            return target[prop];
           }
-          return target[prop];
-        }
-      });
+        });
+      }
     }
-  }
-  return {
-    info,
-    metadata: meta?.metadata || {}
-  };
+    return {
+      info,
+      metadata: meta?.metadata || {}
+    };
+  });
 }
 function parseISODateString(isoDateString) {
   if (!isoDateString)
@@ -339,11 +369,12 @@ function parseISODateString(isoDateString) {
 }
 
 async function extractTextItems$1(data) {
-  const pdf = isPDFDocumentProxy(data) ? data : await getDocumentProxy(data);
-  const items = await Promise.all(
-    Array.from({ length: pdf.numPages }, (_, i) => getPageTextItems(pdf, i + 1))
-  );
-  return { totalPages: pdf.numPages, items };
+  return await withDocument(data, async (pdf) => {
+    const items = await Promise.all(
+      Array.from({ length: pdf.numPages }, (_, i) => getPageTextItems(pdf, i + 1))
+    );
+    return { totalPages: pdf.numPages, items };
+  });
 }
 async function getPageTextItems(document, pageNumber) {
   const page = await document.getPage(pageNumber);
@@ -366,20 +397,24 @@ async function getPageTextItems(document, pageNumber) {
 }
 async function extractText$1(data, options = {}) {
   const { mergePages = false } = options;
-  const pdf = isPDFDocumentProxy(data) ? data : await getDocumentProxy(data);
-  const texts = await Promise.all(
-    Array.from({ length: pdf.numPages }, (_, i) => getPageText(pdf, i + 1))
-  );
-  return {
-    totalPages: pdf.numPages,
-    text: mergePages ? texts.join("\n").replace(/\s+/g, " ") : texts
-  };
+  return await withDocument(data, async (pdf) => {
+    const texts = await Promise.all(
+      Array.from({ length: pdf.numPages }, (_, i) => getPageText(pdf, i + 1))
+    );
+    return {
+      totalPages: pdf.numPages,
+      text: mergePages ? normalizeMergedText(texts) : texts
+    };
+  });
 }
 async function getPageText(document, pageNumber) {
   const page = await document.getPage(pageNumber);
   const content = await page.getTextContent();
   return content.items.filter((item) => item.str != null).map((item) => item.str + (item.hasEOL ? "\n" : "")).join("");
 }
+function normalizeMergedText(texts) {
+  return texts.join("\n").replace(/[^\S\n]+/g, " ").replace(/ ?\n ?/g, "\n").replace(/\n{3,}/g, "\n\n");
+}
 
 async function definePDFJSModule(pdfjs) {
   await resolvePDFJSImport(pdfjs, { reload: true });

package/dist/pdfjs.d.mts

@@ -1 +1 @@
-export * from './types/src/pdf'
+export * from './types/src/pdf.js'

package/dist/pdfjs.d.ts

@@ -1 +1 @@
-export * from './types/src/pdf'
+export * from './types/src/pdf.js'