@chialab/pdfjs-lib 1.0.0-alpha.1 → 1.0.0-alpha.3

package/dist/browser/index.js

@@ -5343,35 +5343,12 @@ async function createCanvas(width, height) {
 var loadingFontPromise = null;
 async function loadDefaultFonts() {
   if (loadingFontPromise === null) {
-    loadingFontPromise = Promise.all([
-      import("./LiberationMono-Regular-UUOCTXY2.js").then(
-        (module) => new Blob([module.default], { type: "font/ttf" })
-      ),
-      import("./LiberationSans-Regular-KIF3IRJY.js").then((module) => new Blob([module.default], { type: "font/ttf" })),
-      import("./LiberationSerif-Regular-ASQ2LI3D.js").then(
-        (module) => new Blob([module.default], { type: "font/ttf" })
-      )
-    ]).then(async ([monoBlob, sansBlob, serifBlob]) => {
-      const fontMono = new FontFace(
-        "Liberation Mono",
-        `url(${URL.createObjectURL(monoBlob)})`
-      );
+    loadingFontPromise = import("./LiberationSans-Regular-KIF3IRJY.js").then((module) => new Blob([module.default], { type: "font/ttf" })).then(async (sansBlob) => {
       const fontSans = new FontFace(
         "Liberation Sans",
         `url(${URL.createObjectURL(sansBlob)})`
       );
-      const fontSerif = new FontFace(
-        "Liberation Serif",
-        `url(${URL.createObjectURL(serifBlob)})`
-      );
-      const fonts = await Promise.all([
-        fontMono.load(),
-        fontSans.load(),
-        fontSerif.load()
-      ]);
-      for (const font of fonts) {
-        document.fonts.add(font);
-      }
+      document.fonts.add(await fontSans.load());
     });
   }
   return loadingFontPromise;
@@ -24632,8 +24609,9 @@ PDFPageProxy.prototype.getAnnotations = async function(params) {
             height * scale,
             0,
             0,
-            width * scale,
-            height * scale
+            // https://github.com/Brooooooklyn/canvas/issues/1011
+            isNodeJS ? viewport.width : width * scale,
+            isNodeJS ? viewport.height : height * scale
           );
           annotation.graphics = await canvasToData(croppedCanvasContext.canvas);
         } catch (e) {
@@ -24657,7 +24635,7 @@ PDFPageProxy.prototype.getAnnotations = async function(params) {
             firstFill = false;
             continue;
           }
-          if (fn === OPS.stroke) {
+          if (fn === OPS.stroke || fn === OPS.closeStroke) {
             if (currentLineWidth === null) {
               annotation.borderStyle.width = 1;
             }
@@ -24665,7 +24643,7 @@ PDFPageProxy.prototype.getAnnotations = async function(params) {
             currentLineWidth = null;
             continue;
           }
-          if (fn === OPS.fillStroke) {
+          if (fn === OPS.fillStroke || fn === OPS.closeFillStroke) {
             if (currentFillColor) {
               annotation.interiorColor = currentFillColor;
               currentFillColor = null;
@@ -24685,9 +24663,6 @@ PDFPageProxy.prototype.getAnnotations = async function(params) {
             annotation.borderStyle.width = currentLineWidth;
           }
           if (fn === OPS.setStrokeRGBColor && firstStroke) {
-            if (!annotation.borderStyle.width) {
-              annotation.borderStyle.width = 1;
-            }
             annotation.color = args;
           }
           if (fn === OPS.setFillRGBColor && firstFill) {
@@ -25762,16 +25737,6 @@ var MAX_TEXT_DIVS_TO_RENDER2 = 1e5;
 var DEFAULT_FONT_SIZE3 = 30;
 var DEFAULT_FONT_ASCENT = 0.8;
 var HYPHEN_REGEX = /-\n+$/;
-function getDefaultFontFamily(type) {
-  switch (type) {
-    case "serif":
-      return "Liberation Serif";
-    case "monospace":
-      return "Liberation Mono";
-    default:
-      return "Liberation Sans";
-  }
-}
 async function createTextLayer(page, {
   canvasFactory,
   viewport = page.getViewport({ scale: 1 }),
@@ -25911,7 +25876,7 @@ async function createTextLayer(page, {
     }
     if (shouldScaleText) {
       if (canvasContext) {
-        canvasContext.font = `${fontHeight * outputScale}px ${getDefaultFontFamily(fontFamily)}`;
+        canvasContext.font = `400 ${fontHeight * outputScale}px 'Liberation Sans'`;
         const { width } = canvasContext.measureText(geom.str);
         if (width > 0) {
           textDiv.scale = (style.vertical ? geom.height : geom.width) * outputScale / width;
@@ -25941,7 +25906,7 @@ async function createTextLayer(page, {
     }
     const savedFont = canvasContext.font;
     canvasContext.canvas.width = canvasContext.canvas.height = DEFAULT_FONT_SIZE3;
-    canvasContext.font = `${DEFAULT_FONT_SIZE3}px ${getDefaultFontFamily(fontFamily)}`;
+    canvasContext.font = `400 ${DEFAULT_FONT_SIZE3}px 'Liberation Sans'`;
     const metrics = canvasContext.measureText(" ");
     let ascent = metrics.fontBoundingBoxAscent;
     let descent = Math.abs(metrics.fontBoundingBoxDescent);
@@ -26213,6 +26178,7 @@ async function createTextLayer(page, {
     }
     return null;
   };
+  await loadDefaultFonts();
   const reader = textContentSource.getReader();
   while (true) {
     const { value, done } = await reader.read();
@@ -26273,7 +26239,6 @@ export {
   createTextLayer,
   createValidAbsoluteUrl,
   fetchData,
-  getDefaultFontFamily,
   getDocument,
   getFilenameFromUrl,
   getPdfFilenameFromUrl,

package/dist/lib/TextLayer.d.ts

@@ -37,12 +37,6 @@ export interface TextLayerImage extends TextLayerNode {
 export declare function isTextNode(node: TextLayerNode): node is TextLayerText;
 export declare function isAnchorNode(node: TextLayerNode): node is TextLayerAnchor;
 export declare function isImageNode(node: TextLayerNode): node is TextLayerImage;
-/**
- * Get the default font family.
- * @param type The font type.
- * @returns The default font family.
- */
-export declare function getDefaultFontFamily(type: string): string;
 export declare function createTextLayer(page: PDFPageProxy, { canvasFactory, viewport, outputScale, annotations, }: {
     canvasFactory: BaseCanvasFactory;
     viewport?: PageViewport;

package/dist/node/index.js

@@ -5332,7 +5332,10 @@ var PrintAnnotationStorage = class extends AnnotationStorage {
 _serializable = new WeakMap();
 
 // src/lib/NodeCanvas.ts
+import { writeFile } from "node:fs/promises";
 import { createRequire } from "node:module";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
 var require2 = createRequire(import.meta.url);
 var {
   createCanvas: create,
@@ -5346,27 +5349,14 @@ async function createCanvas(width, height) {
 var loadingFontPromise = null;
 async function loadDefaultFonts() {
   if (loadingFontPromise === null) {
-    loadingFontPromise = Promise.all([
-      import("./LiberationMono-Regular-KMFXXO3B.js").then(
-        (module) => module.default
-      ),
-      import("./LiberationSans-Regular-CDMMZL5S.js").then((module) => module.default),
-      import("./LiberationSerif-Regular-WAOWR76G.js").then(
-        (module) => module.default
-      )
-    ]).then(([monoBuffer, sansBuffer, serifBuffer]) => {
-      GlobalFonts.register(
-        Buffer.from(monoBuffer),
-        "Liberation Mono"
-      );
-      GlobalFonts.register(
-        Buffer.from(sansBuffer),
+    loadingFontPromise = import("./LiberationSans-Regular-CDMMZL5S.js").then((module) => module.default).then(async (sansBuffer) => {
+      const currentDir = dirname(fileURLToPath(import.meta.url));
+      const fileName = join(currentDir, "LiberationSans-Regular.ttf");
+      await writeFile(fileName, sansBuffer);
+      GlobalFonts.registerFromPath(
+        fileName,
         "Liberation Sans"
       );
-      GlobalFonts.register(
-        Buffer.from(serifBuffer),
-        "Liberation Serif"
-      );
     });
   }
   return loadingFontPromise;
@@ -24929,8 +24919,9 @@ PDFPageProxy.prototype.getAnnotations = async function(params) {
             height * scale,
             0,
             0,
-            width * scale,
-            height * scale
+            // https://github.com/Brooooooklyn/canvas/issues/1011
+            isNodeJS ? viewport.width : width * scale,
+            isNodeJS ? viewport.height : height * scale
           );
           annotation.graphics = await canvasToData(croppedCanvasContext.canvas);
         } catch (e) {
@@ -24954,7 +24945,7 @@ PDFPageProxy.prototype.getAnnotations = async function(params) {
             firstFill = false;
             continue;
           }
-          if (fn === OPS.stroke) {
+          if (fn === OPS.stroke || fn === OPS.closeStroke) {
             if (currentLineWidth === null) {
               annotation.borderStyle.width = 1;
             }
@@ -24962,7 +24953,7 @@ PDFPageProxy.prototype.getAnnotations = async function(params) {
             currentLineWidth = null;
             continue;
           }
-          if (fn === OPS.fillStroke) {
+          if (fn === OPS.fillStroke || fn === OPS.closeFillStroke) {
             if (currentFillColor) {
               annotation.interiorColor = currentFillColor;
               currentFillColor = null;
@@ -24982,9 +24973,6 @@ PDFPageProxy.prototype.getAnnotations = async function(params) {
             annotation.borderStyle.width = currentLineWidth;
           }
           if (fn === OPS.setStrokeRGBColor && firstStroke) {
-            if (!annotation.borderStyle.width) {
-              annotation.borderStyle.width = 1;
-            }
             annotation.color = args;
           }
           if (fn === OPS.setFillRGBColor && firstFill) {
@@ -26059,16 +26047,6 @@ var MAX_TEXT_DIVS_TO_RENDER2 = 1e5;
 var DEFAULT_FONT_SIZE3 = 30;
 var DEFAULT_FONT_ASCENT = 0.8;
 var HYPHEN_REGEX = /-\n+$/;
-function getDefaultFontFamily(type) {
-  switch (type) {
-    case "serif":
-      return "Liberation Serif";
-    case "monospace":
-      return "Liberation Mono";
-    default:
-      return "Liberation Sans";
-  }
-}
 async function createTextLayer(page, {
   canvasFactory,
   viewport = page.getViewport({ scale: 1 }),
@@ -26208,7 +26186,7 @@ async function createTextLayer(page, {
     }
     if (shouldScaleText) {
       if (canvasContext) {
-        canvasContext.font = `${fontHeight * outputScale}px ${getDefaultFontFamily(fontFamily)}`;
+        canvasContext.font = `400 ${fontHeight * outputScale}px 'Liberation Sans'`;
         const { width } = canvasContext.measureText(geom.str);
         if (width > 0) {
           textDiv.scale = (style.vertical ? geom.height : geom.width) * outputScale / width;
@@ -26238,7 +26216,7 @@ async function createTextLayer(page, {
     }
     const savedFont = canvasContext.font;
     canvasContext.canvas.width = canvasContext.canvas.height = DEFAULT_FONT_SIZE3;
-    canvasContext.font = `${DEFAULT_FONT_SIZE3}px ${getDefaultFontFamily(fontFamily)}`;
+    canvasContext.font = `400 ${DEFAULT_FONT_SIZE3}px 'Liberation Sans'`;
     const metrics = canvasContext.measureText(" ");
     let ascent = metrics.fontBoundingBoxAscent;
     let descent = Math.abs(metrics.fontBoundingBoxDescent);
@@ -26510,6 +26488,7 @@ async function createTextLayer(page, {
     }
     return null;
   };
+  await loadDefaultFonts();
   const reader = textContentSource.getReader();
   while (true) {
     const { value, done } = await reader.read();
@@ -26570,7 +26549,6 @@ export {
   createTextLayer,
   createValidAbsoluteUrl,
   fetchData,
-  getDefaultFontFamily,
   getDocument,
   getFilenameFromUrl,
   getPdfFilenameFromUrl,

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.1",
+	"version": "1.0.0-alpha.3",
 	"type": "module",
 	"author": "Chialab <dev@chialab.it>",
 	"license": "MIT",
@@ -27,8 +27,7 @@
 		}
 	},
 	"dependencies": {
-		"@napi-rs/canvas": "^0.1.67",
-		"pdfjs-dist": "^4.10.38"
+		"@napi-rs/canvas": "^0.1.67"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "^1.9.4",