@chialab/pdfjs-lib 1.0.0-alpha.0 → 1.0.0-alpha.2

package/dist/browser/index.js

@@ -5334,43 +5334,24 @@ _serializable = new WeakMap();
 // src/lib/Canvas.ts
 var Path2DConstructor = Path2D;
 async function createCanvas(width, height) {
+  await loadDefaultFonts();
   const canvas = document.createElement("canvas");
   canvas.width = width;
   canvas.height = height;
   return canvas;
 }
+var loadingFontPromise = null;
 async function loadDefaultFonts() {
-  const [monoBlob, sansBlob, serifBlob] = await 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" })
-    )
-  ]);
-  const fontMono = new FontFace(
-    "Liberation Mono",
-    `url(${URL.createObjectURL(monoBlob)})`
-  );
-  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);
+  if (loadingFontPromise === null) {
+    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)})`
+      );
+      document.fonts.add(await fontSans.load());
+    });
   }
+  return loadingFontPromise;
 }
 
 // src/lib/Path2D.ts
@@ -24546,7 +24527,8 @@ async function canvasToData(canvas) {
     }
     return new Uint8Array(await blob.arrayBuffer());
   }
-  return canvas.encode("png");
+  const buffer = await canvas.encode("png");
+  return new Uint8Array(buffer);
 }
 async function toDataUrl(data) {
   if (typeof FileReader !== "undefined") {
@@ -24627,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) {
@@ -25728,7 +25711,7 @@ var SvgCanvasContext = class {
     this._groupStack = [];
   }
 };
-async function createContext(width, height) {
+async function createSvgContext(width, height) {
   const canvas = await createCanvas(width, height);
   return new SvgCanvasContext(
     width,
@@ -25757,17 +25740,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";
-  }
-}
-var loadingFontsPromise = null;
 async function createTextLayer(page, {
   canvasFactory,
   viewport = page.getViewport({ scale: 1 }),
@@ -25907,7 +25879,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;
@@ -25920,10 +25892,6 @@ async function createTextLayer(page, {
     const lang = inputLang || "";
     let canvasContext2 = canvasCache.get(lang);
     if (!canvasContext2) {
-      if (!loadingFontsPromise) {
-        loadingFontsPromise = loadDefaultFonts();
-      }
-      await loadingFontsPromise;
       const { context } = await canvasFactory.create(100, 100);
       context.canvas.lang = lang;
       canvasContext2 = context;
@@ -25941,7 +25909,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 +26181,7 @@ async function createTextLayer(page, {
     }
     return null;
   };
+  await loadDefaultFonts();
   const reader = textContentSource.getReader();
   while (true) {
     const { value, done } = await reader.read();
@@ -26252,6 +26221,7 @@ export {
   PDFDateString,
   PDFWorker,
   PasswordResponses,
+  Path2DConstructor as Path2D,
   PermissionFlag,
   PixelsPerInch,
   RenderingCancelledException,
@@ -26267,11 +26237,11 @@ export {
   XfaLayer,
   build,
   canvasToData,
-  createContext,
+  createCanvas,
+  createSvgContext,
   createTextLayer,
   createValidAbsoluteUrl,
   fetchData,
-  getDefaultFontFamily,
   getDocument,
   getFilenameFromUrl,
   getPdfFilenameFromUrl,
@@ -26313,6 +26283,7 @@ export {
   isUnderlineAnnotation,
   isWatermarkAnnotation,
   isWidgetAnnotation,
+  loadDefaultFonts,
   noContextMenu,
   normalizeUnicode,
   setLayerDimensions,

package/dist/index.d.ts

@@ -3,6 +3,7 @@ import './lib/PDFPageProxy';
 export type { DocumentInitParameters } from './pdf.js/src/display/api';
 export type { BaseCanvasFactory } from './pdf.js/src/display/canvas_factory';
 export * from './lib/utils';
+export * from './lib/Canvas';
 export * from './lib/StandardFontDataFactory';
 export * from './lib/AnnotationData';
 export * from './lib/SvgCanvasContext';

package/dist/lib/SvgCanvasContext.d.ts

@@ -151,6 +151,6 @@ export declare class SvgCanvasContext {
     protected _applyText(text: string, x: number, y: number, action: 'fill'): void;
     protected _clearCanvas(): void;
 }
-export declare function createContext(width: number, height: number): Promise<CanvasRenderingContext2D>;
+export declare function createSvgContext(width: number, height: number): Promise<CanvasRenderingContext2D>;
 export declare function toSvgNode(ctx: CanvasRenderingContext2D): Promise<SvgRoot>;
 export {};

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,
@@ -5340,32 +5343,23 @@ var {
   Path2D
 } = require2("@napi-rs/canvas");
 async function createCanvas(width, height) {
+  await loadDefaultFonts();
   return create(width, height);
 }
+var loadingFontPromise = null;
 async function loadDefaultFonts() {
-  const [monoBuffer, sansBuffer, serifBuffer] = await 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
-    )
-  ]);
-  GlobalFonts.register(
-    Buffer.from(monoBuffer),
-    "Liberation Mono"
-  );
-  GlobalFonts.register(
-    Buffer.from(sansBuffer),
-    "Liberation Sans"
-  );
-  GlobalFonts.register(
-    Buffer.from(serifBuffer),
-    "Liberation Serif"
-  );
+  if (loadingFontPromise === null) {
+    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"
+      );
+    });
+  }
+  return loadingFontPromise;
 }
 
 // src/lib/Path2D.ts
@@ -24843,7 +24837,8 @@ async function canvasToData(canvas) {
     }
     return new Uint8Array(await blob.arrayBuffer());
   }
-  return canvas.encode("png");
+  const buffer = await canvas.encode("png");
+  return new Uint8Array(buffer);
 }
 async function toDataUrl(data) {
   if (typeof FileReader !== "undefined") {
@@ -24924,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) {
@@ -26025,7 +26021,7 @@ var SvgCanvasContext = class {
     this._groupStack = [];
   }
 };
-async function createContext(width, height) {
+async function createSvgContext(width, height) {
   const canvas = await createCanvas(width, height);
   return new SvgCanvasContext(
     width,
@@ -26054,17 +26050,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";
-  }
-}
-var loadingFontsPromise = null;
 async function createTextLayer(page, {
   canvasFactory,
   viewport = page.getViewport({ scale: 1 }),
@@ -26204,7 +26189,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;
@@ -26217,10 +26202,6 @@ async function createTextLayer(page, {
     const lang = inputLang || "";
     let canvasContext2 = canvasCache.get(lang);
     if (!canvasContext2) {
-      if (!loadingFontsPromise) {
-        loadingFontsPromise = loadDefaultFonts();
-      }
-      await loadingFontsPromise;
       const { context } = await canvasFactory.create(100, 100);
       context.canvas.lang = lang;
       canvasContext2 = context;
@@ -26238,7 +26219,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 +26491,7 @@ async function createTextLayer(page, {
     }
     return null;
   };
+  await loadDefaultFonts();
   const reader = textContentSource.getReader();
   while (true) {
     const { value, done } = await reader.read();
@@ -26549,6 +26531,7 @@ export {
   PDFDateString,
   PDFWorker,
   PasswordResponses,
+  Path2D,
   PermissionFlag,
   PixelsPerInch,
   RenderingCancelledException,
@@ -26564,11 +26547,11 @@ export {
   XfaLayer,
   build,
   canvasToData,
-  createContext,
+  createCanvas,
+  createSvgContext,
   createTextLayer,
   createValidAbsoluteUrl,
   fetchData,
-  getDefaultFontFamily,
   getDocument,
   getFilenameFromUrl,
   getPdfFilenameFromUrl,
@@ -26610,6 +26593,7 @@ export {
   isUnderlineAnnotation,
   isWatermarkAnnotation,
   isWidgetAnnotation,
+  loadDefaultFonts,
   noContextMenu,
   normalizeUnicode,
   setLayerDimensions,

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.0",
+	"version": "1.0.0-alpha.2",
 	"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",