@web-ts-toolkit/pdf-reader 0.38.0 → 0.39.0

package/index.d.mts

@@ -8,13 +8,15 @@ declare class PdfReaderError extends Error {
     constructor(code: PdfReaderErrorCode, message: string);
 }
 
+type PdfDocumentInitParameters = NonNullable<Parameters<typeof pdfjs_dist.getDocument>[0]>;
+type PdfTypedArray = Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array | Int32Array | Uint32Array | Float32Array | Float64Array;
 /**
  * PDF.js `getDocument(...)` source accepted by the package root.
  *
  * Prefer trusted in-memory bytes when possible. PDF.js may transfer typed-array
  * ownership to its worker during load.
  */
-type PdfSource = NonNullable<Parameters<typeof pdfjs_dist.getDocument>[0]>;
+type PdfSource = string | URL | ArrayBuffer | PdfTypedArray | number[] | PdfDocumentInitParameters;
 type TransformMatrix = readonly [number, number, number, number, number, number];
 type PageRange = number | readonly [start: number, end: number];
 type ViewportScale = number | ((pageWidth: number, pageHeight: number) => number);
@@ -189,4 +191,4 @@ declare function pdfUrlSource(url: string | URL, options?: PdfUrlSourceOptions):
  */
 declare function configurePdfWorker(worker: string | Worker): void;
 
-export { type BlobPageImage, type ConvertOptions, type DataUrlPageImage, type ExtractedImage, type LoadOptions, type LoadedPdfDocument, type LoadedPdfPage, PDFReader, type PageImageMimeType, type PageImageOutputMode, type PageImageResult, type PageRange, type PageResult, PdfReaderError, type PdfReaderErrorCode, type PdfReaderLimits, type PdfReaderLogger, type PdfReaderOptions, type PdfReaderSourceInfo, type PdfReaderSourcePolicy, type PdfReaderState, type PdfSource, type PdfTextContent, type PdfUrlSource, type PdfUrlSourceOptions, type TransformMatrix, type ViewportScale, configurePdfWorker, pdfUrlSource };
+export { type BlobPageImage, type ConvertOptions, type DataUrlPageImage, type ExtractedImage, type LoadOptions, type LoadedPdfDocument, type LoadedPdfPage, PDFReader, type PageImageMimeType, type PageImageOutputMode, type PageImageResult, type PageRange, type PageResult, type PdfDocumentInitParameters, PdfReaderError, type PdfReaderErrorCode, type PdfReaderLimits, type PdfReaderLogger, type PdfReaderOptions, type PdfReaderSourceInfo, type PdfReaderSourcePolicy, type PdfReaderState, type PdfSource, type PdfTextContent, type PdfTypedArray, type PdfUrlSource, type PdfUrlSourceOptions, type TransformMatrix, type ViewportScale, configurePdfWorker, pdfUrlSource };

package/index.mjs

@@ -269,7 +269,7 @@ var defaultLimits = {
   maxCanvasPixels: 4e7,
   maxEmbeddedImagePixels: 25e6
 };
-var _source, _createCanvas, _logger, _limits, _sourcePolicy, _loadingState, _document, _destroyPromise, _activeRenderTasks, _activePageWorkCount, _destroyed, _lastLoadFailed, _PDFReader_instances, load_fn, processPage_fn, encodePageImage_fn, resolveViewport_fn, encodeCanvasToBlob_fn, allocateCanvas_fn, waitForRender_fn, releaseCanvas_fn, getOrCreateLoadState_fn, awaitWithSignal_fn, createAbortedError_fn, createDestroyedError_fn, createDeadlineExceededError_fn, createUnsupportedEnvironmentError_fn, rethrowLifecycleError_fn, throwIfDestroyed_fn, throwIfAborted_fn, resolveLoadOptions_fn, isAbortSignal_fn, enforceSourcePolicy_fn, isPromiseLike_fn, inspectSource_fn, knownByteLength_fn, readUrl_fn, readHttpHeaders_fn, validateLimits_fn;
+var _source, _createCanvas, _logger, _limits, _sourcePolicy, _loadingState, _loadingTask, _document, _destroyPromise, _activeRenderTasks, _activePageWorkCount, _destroyed, _lastLoadFailed, _PDFReader_instances, load_fn, processPage_fn, encodePageImage_fn, resolveViewport_fn, encodeCanvasToBlob_fn, allocateCanvas_fn, waitForRender_fn, releaseCanvas_fn, getOrCreateLoadState_fn, awaitWithSignal_fn, createAbortedError_fn, createDestroyedError_fn, createDeadlineExceededError_fn, createUnsupportedEnvironmentError_fn, rethrowLifecycleError_fn, throwIfDestroyed_fn, throwIfAborted_fn, resolveLoadOptions_fn, isAbortSignal_fn, enforceSourcePolicy_fn, isPromiseLike_fn, inspectSource_fn, toPdfJsSource_fn, isPdfTypedArray_fn, knownByteLength_fn, readUrl_fn, readHttpHeaders_fn, validateLimits_fn;
 var PDFReader = class {
   constructor(source, options = {}) {
     __privateAdd(this, _PDFReader_instances);
@@ -279,6 +279,7 @@ var PDFReader = class {
     __privateAdd(this, _limits);
     __privateAdd(this, _sourcePolicy);
     __privateAdd(this, _loadingState);
+    __privateAdd(this, _loadingTask);
     __privateAdd(this, _document);
     __privateAdd(this, _destroyPromise);
     __privateAdd(this, _activeRenderTasks, /* @__PURE__ */ new Set());
@@ -356,14 +357,15 @@ var PDFReader = class {
   async destroy() {
     if (__privateGet(this, _destroyPromise)) return __privateGet(this, _destroyPromise);
     __privateSet(this, _destroyed, true);
-    const documentProxy = __privateGet(this, _document);
+    const loadingTask = __privateGet(this, _loadingTask);
     const loadingState = __privateGet(this, _loadingState);
+    __privateSet(this, _loadingTask, void 0);
     __privateSet(this, _document, void 0);
     __privateSet(this, _loadingState, void 0);
     __privateSet(this, _destroyPromise, (async () => {
       for (const renderTask of __privateGet(this, _activeRenderTasks)) renderTask.cancel();
-      if (documentProxy) {
-        await documentProxy.destroy();
+      if (loadingTask) {
+        await loadingTask.destroy();
         return;
       }
       if (!loadingState) return;
@@ -380,6 +382,7 @@ _logger = new WeakMap();
 _limits = new WeakMap();
 _sourcePolicy = new WeakMap();
 _loadingState = new WeakMap();
+_loadingTask = new WeakMap();
 _document = new WeakMap();
 _destroyPromise = new WeakMap();
 _activeRenderTasks = new WeakMap();
@@ -554,7 +557,7 @@ getOrCreateLoadState_fn = function() {
       if (state.destroyed || __privateGet(this, _destroyed)) {
         throw __privateMethod(this, _PDFReader_instances, createDestroyedError_fn).call(this);
       }
-      const task = getDocument(__privateGet(this, _source));
+      const task = getDocument(__privateMethod(this, _PDFReader_instances, toPdfJsSource_fn).call(this, __privateGet(this, _source)));
       state.task = task;
       const documentProxy = await task.promise;
       if (state.destroyed || state.destroyPromise) {
@@ -562,13 +565,14 @@ getOrCreateLoadState_fn = function() {
         throw __privateMethod(this, _PDFReader_instances, createDestroyedError_fn).call(this);
       }
       if (documentProxy.numPages > __privateGet(this, _limits).maxDocumentPages) {
-        await documentProxy.destroy();
+        await task.destroy();
         throw new PdfReaderError(
           "PAGE_LIMIT_EXCEEDED",
           `PDF has ${documentProxy.numPages} pages; limit is ${__privateGet(this, _limits).maxDocumentPages}.`
         );
       }
       __privateMethod(this, _PDFReader_instances, throwIfDestroyed_fn).call(this);
+      __privateSet(this, _loadingTask, task);
       __privateSet(this, _document, documentProxy);
       __privateSet(this, _lastLoadFailed, false);
       return documentProxy;
@@ -710,6 +714,16 @@ inspectSource_fn = function(source) {
     withCredentials: candidate.withCredentials === true
   };
 };
+toPdfJsSource_fn = function(source) {
+  if (typeof source === "string") return { url: source };
+  if (source instanceof URL) return { url: source };
+  if (source instanceof ArrayBuffer || __privateMethod(this, _PDFReader_instances, isPdfTypedArray_fn).call(this, source) || Array.isArray(source))
+    return { data: source };
+  return source;
+};
+isPdfTypedArray_fn = function(source) {
+  return ArrayBuffer.isView(source) && !(source instanceof DataView);
+};
 knownByteLength_fn = function(value) {
   if (value instanceof ArrayBuffer) return value.byteLength;
   if (ArrayBuffer.isView(value)) return value.byteLength;

package/package.json

@@ -2,7 +2,7 @@
   "name": "@web-ts-toolkit/pdf-reader",
   "description": "Resource-safe browser PDF rendering, text extraction, and embedded-image extraction built on PDF.js",
   "homepage": "https://web-ts-toolkit.pages.dev/docs/packages/pdf-reader",
-  "version": "0.38.0",
+  "version": "0.39.0",
   "sideEffects": false,
   "keywords": [
     "pdf",
@@ -23,10 +23,10 @@
     }
   },
   "engines": {
-    "node": ">=22"
+    "node": ">=22.13.0"
   },
   "peerDependencies": {
-    "pdfjs-dist": "~5.7.284"
+    "pdfjs-dist": "^6.2.108"
   },
   "files": [
     "**/*",