@chialab/pdfjs-lib 1.0.0-alpha.16 → 1.0.0-alpha.18

package/dist/browser/index.js

@@ -25868,7 +25868,9 @@ PDFPageProxy.prototype.getAnnotations = async function(params) {
 
 // src/lib/WasmFactory.ts
 var WasmFactory = class {
-  async fetch({ filename }) {
+  async fetch({
+    filename
+  }) {
     switch (filename) {
       case "openjpeg.wasm":
         return import("./openjpeg-K2XBCFFN.js").then(
@@ -25894,7 +25896,9 @@ var StandardFontDataFactory = class extends BaseStandardFontDataFactory {
    * Fetch the corresponding standard font data.
    * We need to use specific dynamic imports for each font file for the bundler to include them.
    */
-  async fetch({ filename }) {
+  async fetch({
+    filename
+  }) {
     switch (filename) {
       case "FoxitDingbats.pfb":
         return import("./FoxitDingbats-SB6TO3S5.js").then((module) => module.default);
@@ -26195,14 +26199,16 @@ async function createTextLayer(page, {
   };
   const getCanvasContext = async (inputLang = null) => {
     const lang = inputLang || "";
-    let canvasContext2 = canvasCache.get(lang);
-    if (!canvasContext2) {
-      const { context } = await canvasFactory.create(100, 100);
-      context.canvas.lang = lang;
-      canvasContext2 = context;
-      canvasCache.set(lang, context);
-    }
-    return canvasContext2;
+    let canvasAndContext = canvasCache.get(lang);
+    if (!canvasAndContext) {
+      canvasAndContext = await canvasFactory.create(
+        100,
+        100
+      );
+      canvasAndContext.canvas.lang = lang;
+      canvasCache.set(lang, canvasAndContext);
+    }
+    return canvasAndContext.context;
   };
   const getAscent = (fontFamily) => {
     const cachedAscent = ascentCache.get(fontFamily);
@@ -26386,54 +26392,55 @@ async function createTextLayer(page, {
                 if (!id) {
                   return;
                 }
-                const imageId = getMarkedObject(id);
-                if (!imageId) {
-                  return;
-                }
-                const imgData = getObject(imageId);
-                if (!imgData?.bitmap && !imgData?.data) {
-                  return;
-                }
-                const { context } = await canvasFactory.create(
-                  imgData.width,
-                  imgData.height
-                );
-                if (imgData.bitmap) {
-                  context.drawImage(imgData.bitmap, 0, 0);
-                } else if (imgData.data) {
-                  if (imgData.kind === ImageKind.RGB_24BPP) {
-                    const rgbaArray = new Uint8ClampedArray(
-                      imgData.width * imgData.height * 4
-                    );
-                    for (let i = 0, j = 0; i < imgData.data.length; i += 3, j += 4) {
-                      rgbaArray[j] = imgData.data[i];
-                      rgbaArray[j + 1] = imgData.data[i + 1];
-                      rgbaArray[j + 2] = imgData.data[i + 2];
-                      rgbaArray[j + 3] = 255;
+                await Promise.all(
+                  getMarkedObjects(id).map(async (imageId) => {
+                    const imgData = getObject(imageId);
+                    if (!imgData?.bitmap && !imgData?.data) {
+                      return;
                     }
-                    const imageData = new ImageData(
-                      rgbaArray,
+                    const canvasAndContext = await canvasFactory.create(
                       imgData.width,
                       imgData.height
                     );
-                    context.putImageData(imageData, 0, 0);
-                  } else {
-                    const imageData = new ImageData(
-                      imgData.data,
-                      imgData.width,
-                      imgData.height
+                    if (imgData.bitmap) {
+                      canvasAndContext.context.drawImage(imgData.bitmap, 0, 0);
+                    } else if (imgData.data) {
+                      if (imgData.kind === ImageKind.RGB_24BPP) {
+                        const rgbaArray = new Uint8ClampedArray(
+                          imgData.width * imgData.height * 4
+                        );
+                        for (let i = 0, j = 0; i < imgData.data.length; i += 3, j += 4) {
+                          rgbaArray[j] = imgData.data[i];
+                          rgbaArray[j + 1] = imgData.data[i + 1];
+                          rgbaArray[j + 2] = imgData.data[i + 2];
+                          rgbaArray[j + 3] = 255;
+                        }
+                        const imageData = new ImageData(
+                          rgbaArray,
+                          imgData.width,
+                          imgData.height
+                        );
+                        canvasAndContext.context.putImageData(imageData, 0, 0);
+                      } else {
+                        const imageData = new ImageData(
+                          imgData.data,
+                          imgData.width,
+                          imgData.height
+                        );
+                        canvasAndContext.context.putImageData(imageData, 0, 0);
+                      }
+                    }
+                    const imgSrc = await toDataUrl(
+                      await canvasToData(canvasAndContext.canvas)
                     );
-                    context.putImageData(imageData, 0, 0);
-                  }
-                }
-                const imgSrc = await toDataUrl(
-                  await canvasToData(context.canvas)
+                    canvasFactory.destroy(canvasAndContext);
+                    const img = {
+                      role: "img",
+                      src: imgSrc
+                    };
+                    parent.children.push(img);
+                  })
                 );
-                const img = {
-                  role: "img",
-                  src: imgSrc
-                };
-                parent.children.push(img);
               }
             })
           );
@@ -26464,12 +26471,16 @@ async function createTextLayer(page, {
       parent.children.push(span.node);
     }
   };
-  const getMarkedObject = (markedContentId) => {
+  const getMarkedObjects = (markedContentId) => {
+    const results = [];
     let currentMarkedContent = null;
     for (let i = 0; i < operatorList.fnArray.length; i++) {
       const fnId = operatorList.fnArray[i];
       const args = operatorList.argsArray[i];
       if (fnId === OPS.endMarkedContent) {
+        if (currentMarkedContent === markedContentId) {
+          return results;
+        }
         currentMarkedContent = null;
         continue;
       }
@@ -26481,10 +26492,10 @@ async function createTextLayer(page, {
         continue;
       }
       if (fnId === OPS.paintImageXObject) {
-        return args[0];
+        results.push(args[0]);
       }
     }
-    return null;
+    return results;
   };
   await loadDefaultFonts();
   const reader = textContentSource.getReader();
@@ -26501,6 +26512,9 @@ async function createTextLayer(page, {
     root?.children.map((child) => renderStructTreeNode(child, rootContainer)) ?? []
   );
   ascentCache.clear();
+  for (const canvasAndContext of canvasCache.values()) {
+    canvasFactory.destroy(canvasAndContext);
+  }
   canvasCache.clear();
   return rootContainer;
 }

package/dist/lib/AnnotationData.d.ts

@@ -123,7 +123,7 @@ export interface FileAttachmentAnnotationData extends TextAnnotationData {
     subtype: 'FileAttachment';
     file: {
         filename: string;
-        content?: Uint8Array | null;
+        content?: Uint8Array<ArrayBuffer> | null;
     };
 }
 export interface SoundAnnotationData extends TextAnnotationData {

package/dist/lib/StandardFontDataFactory.d.ts

@@ -8,7 +8,7 @@ export declare class StandardFontDataFactory extends BaseStandardFontDataFactory
      * Fetch the corresponding standard font data.
      * We need to use specific dynamic imports for each font file for the bundler to include them.
      */
-    fetch({ filename }: {
+    fetch({ filename, }: {
         filename: string;
-    }): Promise<Uint8Array>;
+    }): Promise<Uint8Array<ArrayBuffer>>;
 }

package/dist/lib/WasmFactory.d.ts

@@ -1,5 +1,5 @@
 export declare class WasmFactory {
-    fetch({ filename }: {
+    fetch({ filename, }: {
         filename: string;
-    }): Promise<Uint8Array>;
+    }): Promise<Uint8Array<ArrayBuffer>>;
 }

package/dist/lib/utils.d.ts

@@ -1,17 +1,21 @@
 import type { Canvas } from '@napi-rs/canvas';
+export type CanvasAndContext = {
+    canvas: HTMLCanvasElement;
+    context: CanvasRenderingContext2D;
+};
 /**
  * Convert a canvas to a buffer.
  * @param canvas The canvas to convert.
  * @returns A promise that resolves to the buffer.
  */
-export declare function canvasToData(canvas: HTMLCanvasElement | Canvas): Promise<Uint8Array>;
+export declare function canvasToData(canvas: HTMLCanvasElement | Canvas): Promise<Uint8Array<ArrayBuffer>>;
 /**
  * Convert a buffer to a data url.
  * @param data The buffer to convert.
  * @param type The type of the data url. Defaults to 'image/png'.
  * @returns A promise that resolves to the data url.
  */
-export declare function toDataUrl(data: Uint8Array, type?: string): Promise<string>;
+export declare function toDataUrl(data: Uint8Array<ArrayBuffer>, type?: string): Promise<string>;
 /**
  * Ensure the object can be serialized and unserialized as JSON.
  * Internally it converts typed arrays to plain arrays.

package/dist/node/index.js

@@ -26475,7 +26475,9 @@ PDFPageProxy.prototype.getAnnotations = async function(params) {
 
 // src/lib/WasmFactory.ts
 var WasmFactory = class {
-  async fetch({ filename }) {
+  async fetch({
+    filename
+  }) {
     switch (filename) {
       case "openjpeg.wasm":
         return import("./openjpeg-B2WN24QZ.js").then(
@@ -26501,7 +26503,9 @@ var StandardFontDataFactory = class extends BaseStandardFontDataFactory {
    * Fetch the corresponding standard font data.
    * We need to use specific dynamic imports for each font file for the bundler to include them.
    */
-  async fetch({ filename }) {
+  async fetch({
+    filename
+  }) {
     switch (filename) {
       case "FoxitDingbats.pfb":
         return import("./FoxitDingbats-65AZ2Z2V.js").then((module) => module.default);
@@ -26802,14 +26806,16 @@ async function createTextLayer(page, {
   };
   const getCanvasContext = async (inputLang = null) => {
     const lang = inputLang || "";
-    let canvasContext2 = canvasCache.get(lang);
-    if (!canvasContext2) {
-      const { context } = await canvasFactory.create(100, 100);
-      context.canvas.lang = lang;
-      canvasContext2 = context;
-      canvasCache.set(lang, context);
-    }
-    return canvasContext2;
+    let canvasAndContext = canvasCache.get(lang);
+    if (!canvasAndContext) {
+      canvasAndContext = await canvasFactory.create(
+        100,
+        100
+      );
+      canvasAndContext.canvas.lang = lang;
+      canvasCache.set(lang, canvasAndContext);
+    }
+    return canvasAndContext.context;
   };
   const getAscent = (fontFamily) => {
     const cachedAscent = ascentCache.get(fontFamily);
@@ -26993,54 +26999,55 @@ async function createTextLayer(page, {
                 if (!id) {
                   return;
                 }
-                const imageId = getMarkedObject(id);
-                if (!imageId) {
-                  return;
-                }
-                const imgData = getObject(imageId);
-                if (!imgData?.bitmap && !imgData?.data) {
-                  return;
-                }
-                const { context } = await canvasFactory.create(
-                  imgData.width,
-                  imgData.height
-                );
-                if (imgData.bitmap) {
-                  context.drawImage(imgData.bitmap, 0, 0);
-                } else if (imgData.data) {
-                  if (imgData.kind === ImageKind.RGB_24BPP) {
-                    const rgbaArray = new Uint8ClampedArray(
-                      imgData.width * imgData.height * 4
-                    );
-                    for (let i = 0, j = 0; i < imgData.data.length; i += 3, j += 4) {
-                      rgbaArray[j] = imgData.data[i];
-                      rgbaArray[j + 1] = imgData.data[i + 1];
-                      rgbaArray[j + 2] = imgData.data[i + 2];
-                      rgbaArray[j + 3] = 255;
+                await Promise.all(
+                  getMarkedObjects(id).map(async (imageId) => {
+                    const imgData = getObject(imageId);
+                    if (!imgData?.bitmap && !imgData?.data) {
+                      return;
                     }
-                    const imageData = new ImageData(
-                      rgbaArray,
+                    const canvasAndContext = await canvasFactory.create(
                       imgData.width,
                       imgData.height
                     );
-                    context.putImageData(imageData, 0, 0);
-                  } else {
-                    const imageData = new ImageData(
-                      imgData.data,
-                      imgData.width,
-                      imgData.height
+                    if (imgData.bitmap) {
+                      canvasAndContext.context.drawImage(imgData.bitmap, 0, 0);
+                    } else if (imgData.data) {
+                      if (imgData.kind === ImageKind.RGB_24BPP) {
+                        const rgbaArray = new Uint8ClampedArray(
+                          imgData.width * imgData.height * 4
+                        );
+                        for (let i = 0, j = 0; i < imgData.data.length; i += 3, j += 4) {
+                          rgbaArray[j] = imgData.data[i];
+                          rgbaArray[j + 1] = imgData.data[i + 1];
+                          rgbaArray[j + 2] = imgData.data[i + 2];
+                          rgbaArray[j + 3] = 255;
+                        }
+                        const imageData = new ImageData(
+                          rgbaArray,
+                          imgData.width,
+                          imgData.height
+                        );
+                        canvasAndContext.context.putImageData(imageData, 0, 0);
+                      } else {
+                        const imageData = new ImageData(
+                          imgData.data,
+                          imgData.width,
+                          imgData.height
+                        );
+                        canvasAndContext.context.putImageData(imageData, 0, 0);
+                      }
+                    }
+                    const imgSrc = await toDataUrl(
+                      await canvasToData(canvasAndContext.canvas)
                     );
-                    context.putImageData(imageData, 0, 0);
-                  }
-                }
-                const imgSrc = await toDataUrl(
-                  await canvasToData(context.canvas)
+                    canvasFactory.destroy(canvasAndContext);
+                    const img = {
+                      role: "img",
+                      src: imgSrc
+                    };
+                    parent.children.push(img);
+                  })
                 );
-                const img = {
-                  role: "img",
-                  src: imgSrc
-                };
-                parent.children.push(img);
               }
             })
           );
@@ -27071,12 +27078,16 @@ async function createTextLayer(page, {
       parent.children.push(span.node);
     }
   };
-  const getMarkedObject = (markedContentId) => {
+  const getMarkedObjects = (markedContentId) => {
+    const results = [];
     let currentMarkedContent = null;
     for (let i = 0; i < operatorList.fnArray.length; i++) {
       const fnId = operatorList.fnArray[i];
       const args = operatorList.argsArray[i];
       if (fnId === OPS.endMarkedContent) {
+        if (currentMarkedContent === markedContentId) {
+          return results;
+        }
         currentMarkedContent = null;
         continue;
       }
@@ -27088,10 +27099,10 @@ async function createTextLayer(page, {
         continue;
       }
       if (fnId === OPS.paintImageXObject) {
-        return args[0];
+        results.push(args[0]);
       }
     }
-    return null;
+    return results;
   };
   await loadDefaultFonts();
   const reader = textContentSource.getReader();
@@ -27108,6 +27119,9 @@ async function createTextLayer(page, {
     root?.children.map((child) => renderStructTreeNode(child, rootContainer)) ?? []
   );
   ascentCache.clear();
+  for (const canvasAndContext of canvasCache.values()) {
+    canvasFactory.destroy(canvasAndContext);
+  }
   canvasCache.clear();
   return rootContainer;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@chialab/pdfjs-lib",
 	"description": "A custom Mozilla's PDF.js build with better Node support and extras.",
-	"version": "1.0.0-alpha.16",
+	"version": "1.0.0-alpha.18",
 	"type": "module",
 	"author": "Chialab <dev@chialab.it>",
 	"license": "MIT",