npm - @chialab/pdfjs-lib - Versions diffs - 1.0.0-alpha.17 → 1.0.0-alpha.18 - Mend

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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/dist/browser/index.js CHANGED Viewed

@@ -26199,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);
@@ -26390,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);
               }
             })
           );
@@ -26468,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;
       }
@@ -26485,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();
@@ -26505,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/utils.d.ts CHANGED Viewed

@@ -1,4 +1,8 @@
 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.
@@ -11,7 +15,7 @@ export declare function canvasToData(canvas: HTMLCanvasElement | Canvas): Promis
  * @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 CHANGED Viewed

@@ -26806,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);
@@ -26997,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);
               }
             })
           );
@@ -27075,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;
       }
@@ -27092,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();
@@ -27112,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 CHANGED Viewed

@@ -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.17",
+	"version": "1.0.0-alpha.18",
 	"type": "module",
 	"author": "Chialab <dev@chialab.it>",
 	"license": "MIT",