@pdfme/converter 5.5.10 → 6.0.0

package/package.json

@@ -1,80 +1,56 @@
 {
   "name": "@pdfme/converter",
-  "version": "5.5.10",
-  "sideEffects": false,
-  "author": "hand-dot",
-  "license": "MIT",
+  "version": "6.0.0",
+  "description": "TypeScript base PDF generator and React base UI. Open source, developed by the community, and completely free to use under the MIT license!",
   "keywords": [
     "pdf",
-    "pdf-generation",
     "pdf-designer",
+    "pdf-generation",
     "pdf-viewer",
-    "typescript",
-    "react"
+    "react",
+    "typescript"
   ],
-  "description": "TypeScript base PDF generator and React base UI. Open source, developed by the community, and completely free to use under the MIT license!",
   "homepage": "https://pdfme.com",
+  "bugs": {
+    "url": "https://github.com/pdfme/pdfme/issues"
+  },
+  "license": "MIT",
+  "author": "hand-dot",
   "repository": {
     "type": "git",
     "url": "git@github.com:pdfme/pdfme.git"
   },
-  "bugs": {
-    "url": "https://github.com/pdfme/pdfme/issues"
-  },
-  "main": "dist/cjs/src/index.js",
-  "module": "dist/esm/src/index.js",
-  "types": "dist/types/src/index.node.d.ts",
+  "type": "module",
+  "sideEffects": false,
+  "main": "./dist/index.js",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
-      "browser": "./dist/esm/src/index.browser.js",
-      "node": "./dist/cjs/src/index.node.js",
-      "default": "./dist/esm/src/index.browser.js",
-      "types": "./dist/types/src/index.node.d.ts"
+      "types": "./dist/index.d.ts",
+      "browser": "./dist/index.js",
+      "node": "./dist/index.node.js",
+      "default": "./dist/index.js"
     }
   },
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
-    "dev": "tsc -p tsconfig.esm.json -w",
-    "build": "run-p build:cjs build:esm",
-    "build:cjs": "tsc -p tsconfig.cjs.json",
-    "build:esm": "tsc -p tsconfig.esm.json",
+    "dev": "vite build --watch",
+    "build": "vite build && tsc -p tsconfig.build.json",
     "clean": "rimraf dist",
-    "lint": "eslint --ext .ts src --config eslint.config.mjs",
-    "test": "jest",
-    "prune": "ts-prune src",
-    "prettier": "prettier --write 'src/**/*.ts'"
+    "lint": "vp lint -c ../../.oxlintrc.json src",
+    "fmt": "vp fmt -c ../../.oxfmtrc.json src --write",
+    "test": "vitest run --config ../../vitest.config.ts"
   },
   "dependencies": {
+    "@napi-rs/canvas": "^0.1.97",
     "@pdfme/common": "*",
     "@pdfme/pdf-lib": "*",
-    "pdfjs-dist": "^3.11.174"
+    "pdfjs-dist": "^5.5.207"
   },
   "devDependencies": {
-    "@pdfme/generator": "*",
-    "@types/estree": "^1.0.6",
-    "canvas": "^2.11.2"
-  },
-  "optionalDependencies": {
-    "canvas": "^2.11.0"
-  },
-  "jest": {
-    "resolver": "ts-jest-resolver",
-    "moduleFileExtensions": [
-      "js",
-      "ts"
-    ],
-    "transform": {
-      "^.+\\.ts?$": [
-        "ts-jest",
-        {
-          "tsconfig": "tsconfig.esm.json"
-        }
-      ]
-    },
-    "testMatch": [
-      "**/*.test.ts"
-    ]
-  },
-  "publishConfig": {
-    "access": "public"
+    "@pdfme/generator": "*"
   }
 }

package/src/index.browser.ts

@@ -1,10 +1,35 @@
-import * as pdfjsLib from 'pdfjs-dist';
-// @ts-expect-error - PDFJSWorker import is not properly typed but required for functionality
-import PDFJSWorker from 'pdfjs-dist/build/pdf.worker.entry.js';
+import * as pdfjsLib from 'pdfjs-dist/legacy/build/pdf.mjs';
 import { pdf2img as _pdf2img, Pdf2ImgOptions } from './pdf2img.js';
 import { pdf2size as _pdf2size, Pdf2SizeOptions } from './pdf2size.js';
+import workerSrc from './pdfjs-worker.js?worker&url';
 
-pdfjsLib.GlobalWorkerOptions.workerSrc = PDFJSWorker as unknown as string;
+const clonePdfData = (pdf: ArrayBuffer | Uint8Array) =>
+  pdf instanceof Uint8Array ? new Uint8Array(pdf) : new Uint8Array(pdf);
+
+const loadingTaskMap = new WeakMap<object, { destroy: () => Promise<void> }>();
+
+const getDocument = async (pdf: ArrayBuffer | Uint8Array) => {
+  if (
+    typeof Worker !== 'undefined' &&
+    pdfjsLib.GlobalWorkerOptions.workerSrc !== workerSrc
+  ) {
+    pdfjsLib.GlobalWorkerOptions.workerSrc = workerSrc;
+  }
+
+  const loadingTask = pdfjsLib.getDocument({
+    data: clonePdfData(pdf),
+    isEvalSupported: false,
+  });
+  const document = await loadingTask.promise;
+  loadingTaskMap.set(document, { destroy: () => loadingTask.destroy() });
+  return document;
+};
+
+const destroyDocument = async (document: object) => {
+  const loadingTask = loadingTaskMap.get(document);
+  loadingTaskMap.delete(document);
+  await loadingTask?.destroy();
+};
 
 function dataURLToArrayBuffer(dataURL: string): ArrayBuffer {
   // Split out the actual base64 string from the data URL scheme
@@ -29,7 +54,8 @@ export const pdf2img = async (
   options: Pdf2ImgOptions = {},
 ): Promise<ArrayBuffer[]> =>
   _pdf2img(pdf, options, {
-    getDocument: (pdf) => pdfjsLib.getDocument({ data: pdf, isEvalSupported: false }).promise,
+    getDocument,
+    destroyDocument,
     createCanvas: (width, height) => {
       const canvas = document.createElement('canvas');
       canvas.width = width;
@@ -45,7 +71,8 @@ export const pdf2img = async (
 
 export const pdf2size = async (pdf: ArrayBuffer | Uint8Array, options: Pdf2SizeOptions = {}) =>
   _pdf2size(pdf, options, {
-    getDocument: (pdf) => pdfjsLib.getDocument({ data: pdf, isEvalSupported: false }).promise,
+    getDocument,
+    destroyDocument,
   });
 
 export { img2pdf } from './img2pdf.js';

package/src/index.node.ts

@@ -1,33 +1,45 @@
-import * as pdfjsLib from 'pdfjs-dist/legacy/build/pdf';
-// @ts-expect-error - PDFJSWorker import is not properly typed but required for functionality
-import PDFJSWorker from 'pdfjs-dist/legacy/build/pdf.worker.js';
-import { createCanvas } from 'canvas';
+import * as pdfjsLib from 'pdfjs-dist/legacy/build/pdf.mjs';
+import { Canvas, createCanvas } from '@napi-rs/canvas';
 import { pdf2img as _pdf2img, Pdf2ImgOptions } from './pdf2img.js';
 import { pdf2size as _pdf2size, Pdf2SizeOptions } from './pdf2size.js';
+import { getPdfJsWasmUrl } from './pdfjs.node.js';
 
-pdfjsLib.GlobalWorkerOptions.workerSrc = PDFJSWorker as unknown as string;
+const clonePdfData = (pdf: ArrayBuffer | Uint8Array) =>
+  pdf instanceof Uint8Array ? new Uint8Array(pdf) : new Uint8Array(pdf);
+const pdfJsWasmUrl = getPdfJsWasmUrl();
 
 export const pdf2img = async (
   pdf: ArrayBuffer | Uint8Array,
   options: Pdf2ImgOptions = {},
-): Promise<ArrayBuffer[]> =>
-  _pdf2img(pdf, options, {
-    getDocument: (pdf) => pdfjsLib.getDocument({ data: pdf, isEvalSupported: false }).promise,
+): Promise<ArrayBuffer[]> => {
+  return _pdf2img(pdf, options, {
+    getDocument: (pdf) =>
+      pdfjsLib.getDocument({
+        data: clonePdfData(pdf),
+        isEvalSupported: false,
+        wasmUrl: pdfJsWasmUrl,
+      }).promise,
     createCanvas: (width, height) => createCanvas(width, height) as unknown as HTMLCanvasElement,
-    canvasToArrayBuffer: (canvas) => {
-      // Using a more specific type for the canvas from the 'canvas' package
-      const nodeCanvas = canvas as unknown as import('canvas').Canvas;
-      // Get buffer from the canvas - using the synchronous version without parameters
-      // This will use the default PNG format
-      const buffer = nodeCanvas.toBuffer();
-      // Convert to ArrayBuffer
-      return new Uint8Array(buffer).buffer;
+    canvasToArrayBuffer: (canvas, imageType) => {
+      const nodeCanvas = canvas as unknown as Canvas;
+      const buffer =
+        imageType === 'png' ? nodeCanvas.toBuffer('image/png') : nodeCanvas.toBuffer('image/jpeg');
+      const arrayBuffer = new ArrayBuffer(buffer.byteLength);
+      new Uint8Array(arrayBuffer).set(buffer);
+      return arrayBuffer;
     },
   });
+};
 
-export const pdf2size = async (pdf: ArrayBuffer | Uint8Array, options: Pdf2SizeOptions = {}) =>
-  _pdf2size(pdf, options, {
-    getDocument: (pdf) => pdfjsLib.getDocument({ data: pdf, isEvalSupported: false }).promise,
+export const pdf2size = async (pdf: ArrayBuffer | Uint8Array, options: Pdf2SizeOptions = {}) => {
+  return _pdf2size(pdf, options, {
+    getDocument: (pdf) =>
+      pdfjsLib.getDocument({
+        data: clonePdfData(pdf),
+        isEvalSupported: false,
+        wasmUrl: pdfJsWasmUrl,
+      }).promise,
   });
+};
 
 export { img2pdf } from './img2pdf.js';

package/src/index.ts

@@ -0,0 +1 @@
+export * from './index.browser.js';

package/src/pdf2img.ts

@@ -3,6 +3,7 @@ import type { ImageType } from './types.js';
 
 interface Environment {
   getDocument: (pdf: ArrayBuffer | Uint8Array) => Promise<PDFDocumentProxy>;
+  destroyDocument?: (pdfDoc: PDFDocumentProxy) => Promise<void>;
   createCanvas: (width: number, height: number) => HTMLCanvasElement | OffscreenCanvas;
   canvasToArrayBuffer: (
     canvas: HTMLCanvasElement | OffscreenCanvas,
@@ -28,36 +29,44 @@ export async function pdf2img(
     const { scale = 1, imageType = 'jpeg', range = {} } = options;
     const { start = 0, end = Infinity } = range;
 
-    const { getDocument, createCanvas, canvasToArrayBuffer } = env;
+    const { getDocument, destroyDocument, createCanvas, canvasToArrayBuffer } = env;
 
     const pdfDoc = await getDocument(pdf);
-    const numPages = pdfDoc.numPages;
+    try {
+      const numPages = pdfDoc.numPages;
 
-    const startPage = Math.max(start + 1, 1);
-    const endPage = Math.min(end + 1, numPages);
+      const startPage = Math.max(start + 1, 1);
+      const endPage = Math.min(end + 1, numPages);
 
-    const results: ArrayBuffer[] = [];
+      const results: ArrayBuffer[] = [];
 
-    for (let pageNum = startPage; pageNum <= endPage; pageNum++) {
-      const page = await pdfDoc.getPage(pageNum);
-      const viewport = page.getViewport({ scale });
+      for (let pageNum = startPage; pageNum <= endPage; pageNum++) {
+        const page = await pdfDoc.getPage(pageNum);
+        const viewport = page.getViewport({ scale });
 
-      const canvas = createCanvas(viewport.width, viewport.height);
-      if (!canvas) {
-        throw new Error('Failed to create canvas');
-      }
+        const canvas = createCanvas(viewport.width, viewport.height);
+        if (!canvas) {
+          throw new Error('Failed to create canvas');
+        }
+
+        const context = canvas.getContext('2d') as CanvasRenderingContext2D;
+        if (!context) {
+          throw new Error('Failed to get canvas context');
+        }
 
-      const context = canvas.getContext('2d') as CanvasRenderingContext2D;
-      if (!context) {
-        throw new Error('Failed to get canvas context');
+        await page.render({
+          canvas: canvas as unknown as HTMLCanvasElement,
+          canvasContext: context,
+          viewport,
+        }).promise;
+        const arrayBuffer = canvasToArrayBuffer(canvas, imageType);
+        results.push(arrayBuffer);
       }
 
-      await page.render({ canvasContext: context, viewport }).promise;
-      const arrayBuffer = canvasToArrayBuffer(canvas, imageType);
-      results.push(arrayBuffer);
+      return results;
+    } finally {
+      await destroyDocument?.(pdfDoc);
     }
-
-    return results;
   } catch (error) {
     throw new Error(`[@pdfme/converter] pdf2img failed: ${(error as Error).message}`);
   }

package/src/pdf2size.ts

@@ -3,6 +3,7 @@ import { Size, pt2mm } from '@pdfme/common';
 
 interface Environment {
   getDocument: (pdf: ArrayBuffer | Uint8Array) => Promise<PDFDocumentProxy>;
+  destroyDocument?: (pdfDoc: PDFDocumentProxy) => Promise<void>;
 }
 
 export interface Pdf2SizeOptions {
@@ -15,19 +16,20 @@ export async function pdf2size(
   env: Environment,
 ): Promise<Size[]> {
   const { scale = 1 } = options;
-  const { getDocument } = env;
-
+  const { getDocument, destroyDocument } = env;
   const pdfDoc = await getDocument(pdf);
 
-  const promises = Promise.all(
-    new Array(pdfDoc.numPages).fill('').map(async (_, i) => {
-      return await pdfDoc.getPage(i + 1).then((page) => {
-        const { height, width } = page.getViewport({ scale, rotation: 0 });
-
-        return { height: pt2mm(height), width: pt2mm(width) };
-      });
-    }),
-  );
+  try {
+    return await Promise.all(
+      Array.from({ length: pdfDoc.numPages }, async (_, i) => {
+        return await pdfDoc.getPage(i + 1).then((page) => {
+          const { height, width } = page.getViewport({ scale, rotation: 0 });
 
-  return promises;
+          return { height: pt2mm(height), width: pt2mm(width) };
+        });
+      }),
+    );
+  } finally {
+    await destroyDocument?.(pdfDoc);
+  }
 }

package/src/pdfjs-dist-webpack.d.ts

@@ -0,0 +1,20 @@
+declare module 'pdfjs-dist/webpack.mjs' {
+  export * from 'pdfjs-dist';
+}
+
+declare module 'pdfjs-dist/build/pdf.mjs' {
+  export * from 'pdfjs-dist';
+}
+
+declare module 'pdfjs-dist/build/pdf.worker.mjs';
+
+declare module 'pdfjs-dist/legacy/build/pdf.mjs' {
+  export * from 'pdfjs-dist';
+}
+
+declare module 'pdfjs-dist/legacy/build/pdf.worker.mjs';
+
+declare module '*?worker&url' {
+  const workerUrl: string;
+  export default workerUrl;
+}

package/src/pdfjs-worker-shim.ts

@@ -0,0 +1,20 @@
+const uint8ArrayPrototype = Uint8Array.prototype as Uint8Array & {
+  toHex?: () => string;
+};
+
+if (!uint8ArrayPrototype.toHex) {
+  Object.defineProperty(Uint8Array.prototype, 'toHex', {
+    configurable: true,
+    value(this: Uint8Array) {
+      let result = '';
+
+      for (let i = 0; i < this.length; i += 1) {
+        const hex = this[i].toString(16);
+        result += hex.length === 1 ? `0${hex}` : hex;
+      }
+
+      return result;
+    },
+    writable: true,
+  });
+}

package/src/pdfjs-worker.js

@@ -0,0 +1,2 @@
+import './pdfjs-worker-shim.js';
+import 'pdfjs-dist/legacy/build/pdf.worker.mjs';

package/src/pdfjs.node.ts

@@ -0,0 +1,7 @@
+import { createRequire } from 'node:module';
+import { dirname, join } from 'node:path';
+
+const require = createRequire(import.meta.url);
+const pdfJsDistRoot = dirname(require.resolve('pdfjs-dist/package.json'));
+
+export const getPdfJsWasmUrl = (): string => join(pdfJsDistRoot, 'wasm/');

package/tsconfig.build.json

@@ -0,0 +1,14 @@
+{
+  "extends": "../../tsconfig.build.base.json",
+  "compilerOptions": {
+    "declaration": true,
+    "declarationDir": "./dist",
+    "emitDeclarationOnly": true,
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "outDir": "./dist",
+    "rootDir": "./src",
+    "skipLibCheck": true
+  },
+  "include": ["src/**/*.ts", "src/**/*.d.ts"]
+}

package/tsconfig.json

@@ -1,6 +1,16 @@
 {
-  "extends": "./tsconfig.esm",
+  "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "outDir": "./dist",
-  }
-}
+    "composite": true,
+    "declaration": true,
+    "declarationDir": "./dist/typecheck",
+    "emitDeclarationOnly": true,
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "outDir": "./dist/typecheck",
+    "tsBuildInfoFile": "./dist/typecheck/tsconfig.tsbuildinfo",
+    "skipLibCheck": true
+  },
+  "include": ["src/**/*.ts", "src/**/*.d.ts"],
+  "references": [{ "path": "../common" }, { "path": "../pdf-lib" }]
+}

package/vite.config.mts

@@ -0,0 +1,70 @@
+import { readFileSync } from 'node:fs';
+import { builtinModules } from 'node:module';
+import { dirname, resolve } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { defineConfig } from 'vite';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+const packageJson = JSON.parse(readFileSync(resolve(__dirname, 'package.json'), 'utf8')) as {
+  dependencies?: Record<string, string>;
+  peerDependencies?: Record<string, string>;
+};
+
+const builtinModuleSet = new Set([
+  ...builtinModules,
+  ...builtinModules.map((moduleName) => `node:${moduleName}`),
+]);
+const packageDependencies = [
+  ...Object.keys(packageJson.dependencies ?? {}),
+  ...Object.keys(packageJson.peerDependencies ?? {}),
+];
+const pdfjsWorkerCompatBanner = [
+  'const pdfmeUint8ArrayPrototype = Uint8Array.prototype;',
+  'if (!pdfmeUint8ArrayPrototype.toHex) {',
+  "  Object.defineProperty(Uint8Array.prototype, 'toHex', {",
+  '    configurable: true,',
+  '    value() {',
+  "      let result = '';",
+  '      for (let i = 0; i < this.length; i += 1) {',
+  '        const hex = this[i].toString(16);',
+  '        result += hex.length === 1 ? `0${hex}` : hex;',
+  '      }',
+  '      return result;',
+  '    },',
+  '    writable: true,',
+  '  });',
+  '}',
+].join('\n');
+
+const isExternal = (id: string) =>
+  builtinModuleSet.has(id) ||
+  packageDependencies.some((dependency) => id === dependency || id.startsWith(`${dependency}/`));
+
+export default defineConfig(() => {
+  return {
+    base: './',
+    build: {
+      lib: {
+        entry: {
+          index: resolve(__dirname, 'src/index.browser.ts'),
+          'index.node': resolve(__dirname, 'src/index.node.ts'),
+        },
+        fileName: (_, entryName) => `${entryName}.js`,
+        formats: ['es'],
+      },
+      minify: false,
+      outDir: 'dist',
+      rollupOptions: { external: isExternal },
+      sourcemap: true,
+      target: 'es2020',
+    },
+    worker: {
+      format: 'es',
+      rollupOptions: {
+        output: {
+          banner: pdfjsWorkerCompatBanner,
+        },
+      },
+    },
+  };
+});