unpdf 0.10.0 → 0.11.0

package/README.md

@@ -17,7 +17,7 @@ This library is also intended as a modern alternative to the unmaintained but st
 ## PDF.js Compatibility
 
 > [!NOTE]
-> This package is currently using PDF.js v4.0.189.
+> This package is currently using PDF.js v4.3.136.
 
 ## Installation
 
@@ -50,7 +50,7 @@ const buffer = await fetch(
 const buffer = await readFile("./dummy.pdf");
 
 // Load PDF from buffer
-const pdf = await getDocumentProxy(new Uint8Array(pdf));
+const pdf = await getDocumentProxy(new Uint8Array(buffer));
 // Extract text from PDF
 const { totalPages, text } = await extractText(pdf, { mergePages: true });
 ```
@@ -91,7 +91,7 @@ Generally speaking, you don't need to worry about the PDF.js build. `unpdf` ship
 // if you need another PDF.js build
 import { configureUnPDF } from "unpdf";
 
-configureUnPDF({
+await configureUnPDF({
   // Use the official PDF.js build (make sure to install it first)
   pdfjs: () => import("pdfjs-dist"),
 });
@@ -138,7 +138,9 @@ function getResolvedPDFJS(): Promise<PDFJS>;
 ### `getMeta`
 
 ```ts
-function getMeta(data: BinaryData | PDFDocumentProxy): Promise<{
+function getMeta(
+  data: DocumentInitParameters["data"] | PDFDocumentProxy,
+): Promise<{
   info: Record<string, any>;
   metadata: Record<string, any>;
 }>;
@@ -150,7 +152,7 @@ Extracts all text from a PDF. If `mergePages` is set to `true`, the text of all
 
 ```ts
 function extractText(
-  data: BinaryData | PDFDocumentProxy,
+  data: DocumentInitParameters["data"] | PDFDocumentProxy,
   { mergePages }?: { mergePages?: boolean },
 ): Promise<{
   totalPages: number;
@@ -175,7 +177,7 @@ In order to use this method, you have to meet the following requirements:
 ```ts
 import { configureUnPDF, renderPageAsImage } from "unpdf";
 
-configureUnPDF({
+await configureUnPDF({
   // Use the official PDF.js build
   pdfjs: () => import("pdfjs-dist"),
 });
@@ -194,7 +196,7 @@ await writeFile("dummy-page-1.png", Buffer.from(result));
 
 ```ts
 declare function renderPageAsImage(
-  data: BinaryData | PDFDocumentProxy,
+  data: DocumentInitParameters["data"],
   pageNumber: number,
   options?: {
     canvas?: () => Promise<typeof import("canvas")>;

package/dist/index.cjs

@@ -26,12 +26,10 @@ async function resolvePDFJSImports(pdfjsResolver, { force = false } = {}) {
   }
   if (pdfjsResolver) {
     try {
-      const _import = await pdfjsResolver();
-      if ("resolvePDFJS" in _import) {
-        resolvedModule = await _import.resolvePDFJS();
-        return;
+      resolvedModule = await interopDefault(pdfjsResolver());
+      if (resolvedModule && "resolvePDFJS" in resolvedModule) {
+        resolvedModule = await resolvedModule.resolvePDFJS();
       }
-      resolvedModule = _import.default || _import;
       return;
     } catch {
       throw new Error(
@@ -51,6 +49,10 @@ async function resolvePDFJSImports(pdfjsResolver, { force = false } = {}) {
 function isPDFDocumentProxy(data) {
   return typeof data === "object" && data !== null && "_pdfInfo" in data;
 }
+async function interopDefault(m) {
+  const resolved = await m;
+  return resolved.default || resolved;
+}
 
 async function getMeta$1(data) {
   const pdf = isPDFDocumentProxy(data) ? data : await getDocumentProxy(data);
@@ -67,20 +69,15 @@ async function extractText$1(data, options = {}) {
   const texts = await Promise.all(
     Array.from({ length: pdf.numPages }, (_, i) => getPageText(pdf, i + 1))
   );
-  const filteredTexts = texts.filter(Boolean);
   return {
     totalPages: pdf.numPages,
-    text: mergePages ? filteredTexts.join("\n\n") : filteredTexts
+    text: mergePages ? texts.join("\n").replace(/\s+/g, " ") : texts
   };
 }
-async function getPageText(pdf, pageNumber) {
-  const page = await pdf.getPage(pageNumber);
+async function getPageText(document, pageNumber) {
+  const page = await document.getPage(pageNumber);
   const content = await page.getTextContent();
-  const items = content.items;
-  if (items.length === 0) {
-    return;
-  }
-  return items.map(({ str }) => str).join("\n");
+  return content.items.filter((item) => item.str != null).map((item) => item.str + (item.hasEOL ? "\n" : "")).join("");
 }
 
 async function extractImages$1(data, pageNumber) {
@@ -106,7 +103,8 @@ async function extractImages$1(data, pageNumber) {
   return images;
 }
 async function renderPageAsImage$1(data, pageNumber, options = {}) {
-  const pdf = isPDFDocumentProxy(data) ? data : await getDocumentProxy(data);
+  const canvasFactory = await createIsomorphicCanvasFactory(options.canvas);
+  const pdf = isPDFDocumentProxy(data) ? data : await getDocumentProxy(data, { canvasFactory });
   const page = await pdf.getPage(pageNumber);
   if (pageNumber < 1 || pageNumber > pdf.numPages) {
     throw new Error(
@@ -123,7 +121,6 @@ async function renderPageAsImage$1(data, pageNumber, options = {}) {
   if (outputScale !== 1 && outputScale > 0) {
     viewport = page.getViewport({ scale: outputScale });
   }
-  const canvasFactory = await createIsomorphicCanvasFactory(options.canvas);
   const ctx = canvasFactory.create(viewport.width, viewport.height);
   await page.render({
     canvasContext: ctx.context,
@@ -134,7 +131,7 @@ async function renderPageAsImage$1(data, pageNumber, options = {}) {
   return await response.arrayBuffer();
 }
 async function createIsomorphicCanvasFactory(canvas) {
-  const _canvas = await canvas?.();
+  const _canvas = canvas ? await interopDefault(canvas()) : void 0;
   return {
     _createCanvas(width, height) {
       if (isBrowser) {
@@ -185,7 +182,6 @@ async function configureUnPDF(options) {
   }
 }
 
-const defineUnPDFConfig = configureUnPDF;
 const getMeta = async (...args) => {
   await resolvePDFJSImports();
   return await getMeta$1(...args);
@@ -204,7 +200,7 @@ const renderPageAsImage = async (...args) => {
 };
 
 exports.configureUnPDF = configureUnPDF;
-exports.defineUnPDFConfig = defineUnPDFConfig;
+exports.createIsomorphicCanvasFactory = createIsomorphicCanvasFactory;
 exports.extractImages = extractImages;
 exports.extractText = extractText;
 exports.getDocumentProxy = getDocumentProxy;

package/dist/index.d.cts

@@ -1,27 +1,49 @@
-import { BinaryData, PDFDocumentProxy, DocumentInitParameters } from './types/src/display/api';
+import { DocumentInitParameters, PDFDocumentProxy } from './types/src/display/api';
 import * as canvas from 'canvas';
+import { Canvas } from 'canvas';
 import * as _PDFJS from './types/src/pdf';
 
-declare function getMeta$1(data: BinaryData | PDFDocumentProxy): Promise<{
+declare function getMeta$1(data: DocumentInitParameters["data"] | PDFDocumentProxy): Promise<{
     info: Record<string, any>;
     metadata: Record<string, any>;
 }>;
 
-declare function extractText$1(data: BinaryData | PDFDocumentProxy, options?: {
-    mergePages?: boolean;
+declare function extractText$1(data: DocumentInitParameters["data"] | PDFDocumentProxy, options?: {
+    mergePages?: false;
 }): Promise<{
     totalPages: number;
-    text: string | string[];
+    text: string[];
+}>;
+declare function extractText$1(data: DocumentInitParameters["data"] | PDFDocumentProxy, options: {
+    mergePages: true;
+}): Promise<{
+    totalPages: number;
+    text: string;
 }>;
 
-declare function extractImages$1(data: BinaryData | PDFDocumentProxy, pageNumber: number): Promise<Uint8ClampedArray[]>;
-declare function renderPageAsImage$1(data: BinaryData | PDFDocumentProxy, pageNumber: number, options?: {
+declare function extractImages$1(data: DocumentInitParameters["data"] | PDFDocumentProxy, pageNumber: number): Promise<Uint8ClampedArray[]>;
+declare function renderPageAsImage$1(data: DocumentInitParameters["data"] | PDFDocumentProxy, pageNumber: number, options?: {
     canvas?: () => Promise<typeof canvas>;
     /** @default 1 */
     scale?: number;
     width?: number;
     height?: number;
 }): Promise<ArrayBuffer>;
+declare function createIsomorphicCanvasFactory(canvas?: () => Promise<typeof canvas>): Promise<{
+    _createCanvas(width: number, height: number): Canvas | HTMLCanvasElement;
+    create(width: number, height: number): {
+        canvas: Canvas | HTMLCanvasElement;
+        context: CanvasRenderingContext2D;
+    };
+    reset(ctx: {
+        canvas?: Canvas;
+        context?: CanvasRenderingContext2D;
+    }, width: number, height: number): void;
+    destroy(ctx: {
+        canvas?: Canvas;
+        context?: CanvasRenderingContext2D;
+    }): void;
+}>;
 
 type PDFJS = typeof _PDFJS;
 interface UnPDFConfiguration {
@@ -37,8 +59,6 @@ interface UnPDFConfiguration {
     pdfjs?: () => Promise<any>;
 }
 
-declare function configureUnPDF(options: UnPDFConfiguration): Promise<void>;
-
 /**
  * Returns a PDFDocumentProxy instance from a given binary data.
  *
@@ -46,18 +66,17 @@ declare function configureUnPDF(options: UnPDFConfiguration): Promise<void>;
  * - `isEvalSupported: false`
  * - `useSystemFonts: true`
  */
-declare function getDocumentProxy(data: BinaryData, options?: DocumentInitParameters): Promise<PDFDocumentProxy>;
+declare function getDocumentProxy(data: DocumentInitParameters["data"], options?: DocumentInitParameters): Promise<PDFDocumentProxy>;
 declare function getResolvedPDFJS(): Promise<PDFJS>;
 declare function resolvePDFJSImports(pdfjsResolver?: () => Promise<any>, { force }?: {
     force?: boolean | undefined;
 }): Promise<void>;
 
-/** @deprecated Use `configureUnPDF` instead */
-declare const defineUnPDFConfig: typeof configureUnPDF;
+declare function configureUnPDF(options: UnPDFConfiguration): Promise<void>;
 
 declare const getMeta: typeof getMeta$1;
 declare const extractText: typeof extractText$1;
 declare const extractImages: typeof extractImages$1;
 declare const renderPageAsImage: typeof renderPageAsImage$1;
 
-export { configureUnPDF, defineUnPDFConfig, extractImages, extractText, getDocumentProxy, getMeta, getResolvedPDFJS, renderPageAsImage, resolvePDFJSImports };
+export { configureUnPDF, createIsomorphicCanvasFactory, extractImages, extractText, getDocumentProxy, getMeta, getResolvedPDFJS, renderPageAsImage, resolvePDFJSImports };

package/dist/index.d.mts

@@ -1,27 +1,49 @@
-import { BinaryData, PDFDocumentProxy, DocumentInitParameters } from './types/src/display/api';
+import { DocumentInitParameters, PDFDocumentProxy } from './types/src/display/api';
 import * as canvas from 'canvas';
+import { Canvas } from 'canvas';
 import * as _PDFJS from './types/src/pdf';
 
-declare function getMeta$1(data: BinaryData | PDFDocumentProxy): Promise<{
+declare function getMeta$1(data: DocumentInitParameters["data"] | PDFDocumentProxy): Promise<{
     info: Record<string, any>;
     metadata: Record<string, any>;
 }>;
 
-declare function extractText$1(data: BinaryData | PDFDocumentProxy, options?: {
-    mergePages?: boolean;
+declare function extractText$1(data: DocumentInitParameters["data"] | PDFDocumentProxy, options?: {
+    mergePages?: false;
 }): Promise<{
     totalPages: number;
-    text: string | string[];
+    text: string[];
+}>;
+declare function extractText$1(data: DocumentInitParameters["data"] | PDFDocumentProxy, options: {
+    mergePages: true;
+}): Promise<{
+    totalPages: number;
+    text: string;
 }>;
 
-declare function extractImages$1(data: BinaryData | PDFDocumentProxy, pageNumber: number): Promise<Uint8ClampedArray[]>;
-declare function renderPageAsImage$1(data: BinaryData | PDFDocumentProxy, pageNumber: number, options?: {
+declare function extractImages$1(data: DocumentInitParameters["data"] | PDFDocumentProxy, pageNumber: number): Promise<Uint8ClampedArray[]>;
+declare function renderPageAsImage$1(data: DocumentInitParameters["data"] | PDFDocumentProxy, pageNumber: number, options?: {
     canvas?: () => Promise<typeof canvas>;
     /** @default 1 */
     scale?: number;
     width?: number;
     height?: number;
 }): Promise<ArrayBuffer>;
+declare function createIsomorphicCanvasFactory(canvas?: () => Promise<typeof canvas>): Promise<{
+    _createCanvas(width: number, height: number): Canvas | HTMLCanvasElement;
+    create(width: number, height: number): {
+        canvas: Canvas | HTMLCanvasElement;
+        context: CanvasRenderingContext2D;
+    };
+    reset(ctx: {
+        canvas?: Canvas;
+        context?: CanvasRenderingContext2D;
+    }, width: number, height: number): void;
+    destroy(ctx: {
+        canvas?: Canvas;
+        context?: CanvasRenderingContext2D;
+    }): void;
+}>;
 
 type PDFJS = typeof _PDFJS;
 interface UnPDFConfiguration {
@@ -37,8 +59,6 @@ interface UnPDFConfiguration {
     pdfjs?: () => Promise<any>;
 }
 
-declare function configureUnPDF(options: UnPDFConfiguration): Promise<void>;
-
 /**
  * Returns a PDFDocumentProxy instance from a given binary data.
  *
@@ -46,18 +66,17 @@ declare function configureUnPDF(options: UnPDFConfiguration): Promise<void>;
  * - `isEvalSupported: false`
  * - `useSystemFonts: true`
  */
-declare function getDocumentProxy(data: BinaryData, options?: DocumentInitParameters): Promise<PDFDocumentProxy>;
+declare function getDocumentProxy(data: DocumentInitParameters["data"], options?: DocumentInitParameters): Promise<PDFDocumentProxy>;
 declare function getResolvedPDFJS(): Promise<PDFJS>;
 declare function resolvePDFJSImports(pdfjsResolver?: () => Promise<any>, { force }?: {
     force?: boolean | undefined;
 }): Promise<void>;
 
-/** @deprecated Use `configureUnPDF` instead */
-declare const defineUnPDFConfig: typeof configureUnPDF;
+declare function configureUnPDF(options: UnPDFConfiguration): Promise<void>;
 
 declare const getMeta: typeof getMeta$1;
 declare const extractText: typeof extractText$1;
 declare const extractImages: typeof extractImages$1;
 declare const renderPageAsImage: typeof renderPageAsImage$1;
 
-export { configureUnPDF, defineUnPDFConfig, extractImages, extractText, getDocumentProxy, getMeta, getResolvedPDFJS, renderPageAsImage, resolvePDFJSImports };
+export { configureUnPDF, createIsomorphicCanvasFactory, extractImages, extractText, getDocumentProxy, getMeta, getResolvedPDFJS, renderPageAsImage, resolvePDFJSImports };

package/dist/index.d.ts

@@ -1,27 +1,49 @@
-import { BinaryData, PDFDocumentProxy, DocumentInitParameters } from './types/src/display/api';
+import { DocumentInitParameters, PDFDocumentProxy } from './types/src/display/api';
 import * as canvas from 'canvas';
+import { Canvas } from 'canvas';
 import * as _PDFJS from './types/src/pdf';
 
-declare function getMeta$1(data: BinaryData | PDFDocumentProxy): Promise<{
+declare function getMeta$1(data: DocumentInitParameters["data"] | PDFDocumentProxy): Promise<{
     info: Record<string, any>;
     metadata: Record<string, any>;
 }>;
 
-declare function extractText$1(data: BinaryData | PDFDocumentProxy, options?: {
-    mergePages?: boolean;
+declare function extractText$1(data: DocumentInitParameters["data"] | PDFDocumentProxy, options?: {
+    mergePages?: false;
 }): Promise<{
     totalPages: number;
-    text: string | string[];
+    text: string[];
+}>;
+declare function extractText$1(data: DocumentInitParameters["data"] | PDFDocumentProxy, options: {
+    mergePages: true;
+}): Promise<{
+    totalPages: number;
+    text: string;
 }>;
 
-declare function extractImages$1(data: BinaryData | PDFDocumentProxy, pageNumber: number): Promise<Uint8ClampedArray[]>;
-declare function renderPageAsImage$1(data: BinaryData | PDFDocumentProxy, pageNumber: number, options?: {
+declare function extractImages$1(data: DocumentInitParameters["data"] | PDFDocumentProxy, pageNumber: number): Promise<Uint8ClampedArray[]>;
+declare function renderPageAsImage$1(data: DocumentInitParameters["data"] | PDFDocumentProxy, pageNumber: number, options?: {
     canvas?: () => Promise<typeof canvas>;
     /** @default 1 */
     scale?: number;
     width?: number;
     height?: number;
 }): Promise<ArrayBuffer>;
+declare function createIsomorphicCanvasFactory(canvas?: () => Promise<typeof canvas>): Promise<{
+    _createCanvas(width: number, height: number): Canvas | HTMLCanvasElement;
+    create(width: number, height: number): {
+        canvas: Canvas | HTMLCanvasElement;
+        context: CanvasRenderingContext2D;
+    };
+    reset(ctx: {
+        canvas?: Canvas;
+        context?: CanvasRenderingContext2D;
+    }, width: number, height: number): void;
+    destroy(ctx: {
+        canvas?: Canvas;
+        context?: CanvasRenderingContext2D;
+    }): void;
+}>;
 
 type PDFJS = typeof _PDFJS;
 interface UnPDFConfiguration {
@@ -37,8 +59,6 @@ interface UnPDFConfiguration {
     pdfjs?: () => Promise<any>;
 }
 
-declare function configureUnPDF(options: UnPDFConfiguration): Promise<void>;
-
 /**
  * Returns a PDFDocumentProxy instance from a given binary data.
  *
@@ -46,18 +66,17 @@ declare function configureUnPDF(options: UnPDFConfiguration): Promise<void>;
  * - `isEvalSupported: false`
  * - `useSystemFonts: true`
  */
-declare function getDocumentProxy(data: BinaryData, options?: DocumentInitParameters): Promise<PDFDocumentProxy>;
+declare function getDocumentProxy(data: DocumentInitParameters["data"], options?: DocumentInitParameters): Promise<PDFDocumentProxy>;
 declare function getResolvedPDFJS(): Promise<PDFJS>;
 declare function resolvePDFJSImports(pdfjsResolver?: () => Promise<any>, { force }?: {
     force?: boolean | undefined;
 }): Promise<void>;
 
-/** @deprecated Use `configureUnPDF` instead */
-declare const defineUnPDFConfig: typeof configureUnPDF;
+declare function configureUnPDF(options: UnPDFConfiguration): Promise<void>;
 
 declare const getMeta: typeof getMeta$1;
 declare const extractText: typeof extractText$1;
 declare const extractImages: typeof extractImages$1;
 declare const renderPageAsImage: typeof renderPageAsImage$1;
 
-export { configureUnPDF, defineUnPDFConfig, extractImages, extractText, getDocumentProxy, getMeta, getResolvedPDFJS, renderPageAsImage, resolvePDFJSImports };
+export { configureUnPDF, createIsomorphicCanvasFactory, extractImages, extractText, getDocumentProxy, getMeta, getResolvedPDFJS, renderPageAsImage, resolvePDFJSImports };

package/dist/index.mjs

@@ -24,12 +24,10 @@ async function resolvePDFJSImports(pdfjsResolver, { force = false } = {}) {
   }
   if (pdfjsResolver) {
     try {
-      const _import = await pdfjsResolver();
-      if ("resolvePDFJS" in _import) {
-        resolvedModule = await _import.resolvePDFJS();
-        return;
+      resolvedModule = await interopDefault(pdfjsResolver());
+      if (resolvedModule && "resolvePDFJS" in resolvedModule) {
+        resolvedModule = await resolvedModule.resolvePDFJS();
       }
-      resolvedModule = _import.default || _import;
       return;
     } catch {
       throw new Error(
@@ -49,6 +47,10 @@ async function resolvePDFJSImports(pdfjsResolver, { force = false } = {}) {
 function isPDFDocumentProxy(data) {
   return typeof data === "object" && data !== null && "_pdfInfo" in data;
 }
+async function interopDefault(m) {
+  const resolved = await m;
+  return resolved.default || resolved;
+}
 
 async function getMeta$1(data) {
   const pdf = isPDFDocumentProxy(data) ? data : await getDocumentProxy(data);
@@ -65,20 +67,15 @@ async function extractText$1(data, options = {}) {
   const texts = await Promise.all(
     Array.from({ length: pdf.numPages }, (_, i) => getPageText(pdf, i + 1))
   );
-  const filteredTexts = texts.filter(Boolean);
   return {
     totalPages: pdf.numPages,
-    text: mergePages ? filteredTexts.join("\n\n") : filteredTexts
+    text: mergePages ? texts.join("\n").replace(/\s+/g, " ") : texts
   };
 }
-async function getPageText(pdf, pageNumber) {
-  const page = await pdf.getPage(pageNumber);
+async function getPageText(document, pageNumber) {
+  const page = await document.getPage(pageNumber);
   const content = await page.getTextContent();
-  const items = content.items;
-  if (items.length === 0) {
-    return;
-  }
-  return items.map(({ str }) => str).join("\n");
+  return content.items.filter((item) => item.str != null).map((item) => item.str + (item.hasEOL ? "\n" : "")).join("");
 }
 
 async function extractImages$1(data, pageNumber) {
@@ -104,7 +101,8 @@ async function extractImages$1(data, pageNumber) {
   return images;
 }
 async function renderPageAsImage$1(data, pageNumber, options = {}) {
-  const pdf = isPDFDocumentProxy(data) ? data : await getDocumentProxy(data);
+  const canvasFactory = await createIsomorphicCanvasFactory(options.canvas);
+  const pdf = isPDFDocumentProxy(data) ? data : await getDocumentProxy(data, { canvasFactory });
   const page = await pdf.getPage(pageNumber);
   if (pageNumber < 1 || pageNumber > pdf.numPages) {
     throw new Error(
@@ -121,7 +119,6 @@ async function renderPageAsImage$1(data, pageNumber, options = {}) {
   if (outputScale !== 1 && outputScale > 0) {
     viewport = page.getViewport({ scale: outputScale });
   }
-  const canvasFactory = await createIsomorphicCanvasFactory(options.canvas);
   const ctx = canvasFactory.create(viewport.width, viewport.height);
   await page.render({
     canvasContext: ctx.context,
@@ -132,7 +129,7 @@ async function renderPageAsImage$1(data, pageNumber, options = {}) {
   return await response.arrayBuffer();
 }
 async function createIsomorphicCanvasFactory(canvas) {
-  const _canvas = await canvas?.();
+  const _canvas = canvas ? await interopDefault(canvas()) : void 0;
   return {
     _createCanvas(width, height) {
       if (isBrowser) {
@@ -183,7 +180,6 @@ async function configureUnPDF(options) {
   }
 }
 
-const defineUnPDFConfig = configureUnPDF;
 const getMeta = async (...args) => {
   await resolvePDFJSImports();
   return await getMeta$1(...args);
@@ -201,4 +197,4 @@ const renderPageAsImage = async (...args) => {
   return await renderPageAsImage$1(...args);
 };
 
-export { configureUnPDF, defineUnPDFConfig, extractImages, extractText, getDocumentProxy, getMeta, getResolvedPDFJS, renderPageAsImage, resolvePDFJSImports };
+export { configureUnPDF, createIsomorphicCanvasFactory, extractImages, extractText, getDocumentProxy, getMeta, getResolvedPDFJS, renderPageAsImage, resolvePDFJSImports };

package/dist/pdfjs.d.mts

@@ -1,3 +1,4 @@
 import * as PDFJS from './types/src/pdf'
 declare function resolvePDFJS(): Promise<typeof PDFJS>
 export { resolvePDFJS }
+export * from './types/src/pdf'

package/dist/pdfjs.d.ts

@@ -1,3 +1,4 @@
 import * as PDFJS from './types/src/pdf'
 declare function resolvePDFJS(): Promise<typeof PDFJS>
 export { resolvePDFJS }
+export * from './types/src/pdf'