@adnsistemas/pdf-lib 2.7.2 → 2.8.0

package/dist/pdf-lib.esm.js

@@ -9002,7 +9002,7 @@ class PDFString extends PDFObject {
                     pushByte(CharCodes$1.LeftParen);
                 else if (byte === CharCodes$1.RightParen)
                     pushByte(CharCodes$1.RightParen);
-                else if (byte === CharCodes$1.Backspace)
+                else if (byte === CharCodes$1.BackSlash)
                     pushByte(CharCodes$1.BackSlash);
                 else if (byte >= CharCodes$1.Zero && byte <= CharCodes$1.Seven) {
                     octal += char;
@@ -9982,13 +9982,9 @@ class IncrementalDocumentSnapshot {
         this.context = context;
     }
     shouldSave(objectNumber) {
-        if (objectNumber > this.lastObjectNumber) {
+        if (objectNumber > this.lastObjectNumber)
             return true;
-        }
-        if (this.changedObjects.includes(objectNumber)) {
-            return true;
-        }
-        return false;
+        return this.changedObjects.has(objectNumber);
     }
     markRefForSave(ref) {
         this.markRefsForSave([ref]);
@@ -9996,7 +9992,7 @@ class IncrementalDocumentSnapshot {
     markRefsForSave(refs) {
         refs.forEach((ref) => {
             if (ref)
-                this.changedObjects.push(ref.objectNumber);
+                this.changedObjects.add(ref.objectNumber);
         });
     }
     markObjForSave(obj) {
@@ -10331,6 +10327,11 @@ class PDFWriter {
          * be corrected, to be accurate.
          */
         this._largestSkippedObjectNum = 0;
+        /**
+         * Used to check wheter an object should be saved or not, preserves the object number of the
+         * last XRef Stream object, if there is one.
+         */
+        this._lastXRefObjectNumber = 0;
         this.shouldWaitForTick = (n) => {
             this.parsedObjects += n;
             return this.parsedObjects % this.objectsPerTick === 0;
@@ -10341,20 +10342,37 @@ class PDFWriter {
     }
     /**
      * For incremental saves, defers the decision to the snapshot.
-     * For full saves, checks that the object is not an XRef stream object.
+     * For full saves, checks that the object is not the last XRef stream object.
      * @param {boolean} incremental If making an incremental save, or a full save of the PDF
      * @param {number} objNum Object number
-     * @param {PDFObject} object PDFObject used to check if it is an XRef stream, when not 'incremental' saving
+     * @param {[PDFRef, PDFObject][]} objects List of objects that form the PDF
      * @returns {boolean} whether the object should be saved or not
      */
-    shouldSave(incremental, objNum, object) {
+    shouldSave(incremental, objNum, objects) {
         let should = true;
         if (incremental) {
             should = this.snapshot.shouldSave(objNum);
         }
         else {
-            should = !(object instanceof PDFRawStream &&
-                object.dict.lookup(PDFName.of('Type')) === PDFName.of('XRef'));
+            // only the last XRef Stream will be regenerated on save
+            if (!this._lastXRefObjectNumber) {
+                // if no XRef Stream, then nothing should be skipped
+                this._lastXRefObjectNumber = this.context.largestObjectNumber + 1;
+                const checkWatermark = this._lastXRefObjectNumber - 10; // max number of objects in the final part of the PDF to check
+                // search the last XRef Stream, if there is one, objects are expected to be in object number order
+                for (let idx = objects.length - 1; idx > 0; idx--) {
+                    // if not in last 'rangeToCheck' objects, there is none that should be skipped, most probably a linearized PDF, or without XRef Streams
+                    if (objects[idx][0].objectNumber < checkWatermark)
+                        break;
+                    const object = objects[idx][1];
+                    if (object instanceof PDFRawStream &&
+                        object.dict.lookup(PDFName.of('Type')) === PDFName.of('XRef')) {
+                        this._lastXRefObjectNumber = objects[idx][0].objectNumber;
+                        break;
+                    }
+                }
+            }
+            should = objNum !== this._lastXRefObjectNumber;
         }
         if (!should && this._largestSkippedObjectNum < objNum)
             this._largestSkippedObjectNum = objNum;
@@ -10373,7 +10391,7 @@ class PDFWriter {
             buffer[offset++] = CharCodes$1.Newline;
             for (let idx = 0, len = indirectObjects.length; idx < len; idx++) {
                 const [ref, object] = indirectObjects[idx];
-                if (!this.shouldSave(incremental, ref.objectNumber, object)) {
+                if (!this.shouldSave(incremental, ref.objectNumber, indirectObjects)) {
                     continue;
                 }
                 const objectNumber = String(ref.objectNumber);
@@ -10439,6 +10457,7 @@ class PDFWriter {
     computeBufferSize(incremental) {
         return __awaiter(this, void 0, void 0, function* () {
             this._largestSkippedObjectNum = 0;
+            this._lastXRefObjectNumber = 0;
             const header = PDFHeader.forVersion(1, 7);
             let size = this.snapshot.pdfSize;
             if (!incremental) {
@@ -10451,7 +10470,7 @@ class PDFWriter {
             for (let idx = 0, len = indirectObjects.length; idx < len; idx++) {
                 const indirectObject = indirectObjects[idx];
                 const [ref, object] = indirectObject;
-                if (!this.shouldSave(incremental, ref.objectNumber, object))
+                if (!this.shouldSave(incremental, ref.objectNumber, indirectObjects))
                     continue;
                 if (security)
                     this.encrypt(ref, object, security);
@@ -12426,6 +12445,12 @@ class PDFCatalog extends PDFDict {
     AcroForm() {
         return this.lookupMaybe(PDFName.of('AcroForm'), PDFDict);
     }
+    Names() {
+        return this.lookupMaybe(PDFName.of('Names'), PDFDict);
+    }
+    AttachedFiles() {
+        return this.lookupMaybe(PDFName.of('AF'), PDFArray);
+    }
     getAcroForm() {
         const dict = this.AcroForm();
         if (!dict)
@@ -13256,7 +13281,7 @@ const ChannelToColorSpace = {
 class JpegEmbedder {
     static for(imageData) {
         return __awaiter(this, void 0, void 0, function* () {
-            const dataView = new DataView(imageData.buffer);
+            const dataView = new DataView(imageData.buffer, imageData.byteOffset, imageData.byteLength);
             const soi = dataView.getUint16(0);
             if (soi !== 0xffd8)
                 throw new Error('SOI not found in JPEG');
@@ -15913,7 +15938,8 @@ class PDFObjectParser extends BaseParser {
                 let actualValue = value.substring(1, value.length - 1);
                 if (this.cryptoFactory && ref) {
                     const transformer = this.cryptoFactory.createCipherTransform(ref.objectNumber, ref.generationNumber);
-                    actualValue = transformer.decryptString(actualValue);
+                    const decrypted = transformer.decryptBytes(PDFString.of(actualValue).asBytes());
+                    actualValue = arrayAsString(decrypted);
                 }
                 // Remove the outer parens so they aren't part of the contents
                 return PDFString.of(actualValue);
@@ -29497,13 +29523,13 @@ const drawOptionList = (options) => {
     ];
 };
 const getDrawingOperator = ({ color, borderWidth, borderColor, fillRule, }) => {
-    if (color && borderColor && borderWidth) {
+    if (color && borderColor && borderWidth !== 0) {
         return fillAndStroke;
     }
     else if (color) {
         return fillRule === FillRule.EvenOdd ? fillEvenOdd : fill;
     }
-    else if (borderColor && borderWidth) {
+    else if (borderColor && borderWidth !== 0) {
         return stroke;
     }
     return undefined;
@@ -34208,6 +34234,16 @@ class PDFEmbeddedFile {
     getEmbedder() {
         return this.embedder;
     }
+    /**
+     * Returns whether or not this file has already been embedded.
+     * @returns true if the file has already been embedded, false otherwise.
+     */
+    getAlreadyEmbedded() {
+        return this.alreadyEmbedded;
+    }
+    getRef() {
+        return this.ref;
+    }
 }
 /**
  * > **NOTE:** You probably don't want to call this method directly. Instead,
@@ -36770,13 +36806,17 @@ class PDFDocument {
         for (let idx = 0, len = EFNames.size(); idx < len; idx += 2) {
             const fileName = EFNames.lookup(idx);
             const fileSpec = EFNames.lookup(idx + 1, PDFDict);
-            rawAttachments.push({ fileName, fileSpec });
+            rawAttachments.push({
+                fileName,
+                fileSpec,
+                specRef: EFNames.get(idx + 1),
+            });
         }
         return rawAttachments;
     }
     getSavedAttachments() {
         const rawAttachments = this.getRawAttachments();
-        return rawAttachments.flatMap(({ fileName, fileSpec }) => {
+        return rawAttachments.flatMap(({ fileName, fileSpec, specRef }) => {
             const efDict = fileSpec.lookup(PDFName.of('EF'));
             if (!(efDict instanceof PDFDict))
                 return [];
@@ -36809,7 +36849,11 @@ class PDFDocument {
                     modificationDate = modDateRaw.decodeDate();
                 }
             }
-            const description = fileSpec.lookup(PDFName.of('Desc')).decodeText();
+            const descRaw = fileSpec.lookup(PDFName.of('Desc'));
+            let description;
+            if (descRaw instanceof PDFHexString) {
+                description = descRaw.decodeText();
+            }
             return [
                 {
                     name: fileName.decodeText(),
@@ -36819,12 +36863,16 @@ class PDFDocument {
                     description,
                     creationDate,
                     modificationDate,
+                    embeddedFileDict: efDict,
+                    specRef,
                 },
             ];
         });
     }
     getUnsavedAttachments() {
-        const attachments = this.embeddedFiles.map((file) => {
+        const attachments = this.embeddedFiles.flatMap((file) => {
+            if (file.getAlreadyEmbedded())
+                return [];
             const embedder = file.getEmbedder();
             return {
                 name: embedder.fileName,
@@ -36834,6 +36882,7 @@ class PDFDocument {
                 afRelationship: embedder.options.afRelationship,
                 creationDate: embedder.options.creationDate,
                 modificationDate: embedder.options.modificationDate,
+                pdfEmbeddedFile: file,
             };
         });
         return attachments;
@@ -36848,6 +36897,47 @@ class PDFDocument {
         const unsavedAttachments = this.getUnsavedAttachments();
         return [...savedAttachments, ...unsavedAttachments];
     }
+    /**
+     * Removes an attachment from PDF, based on name.
+     * @param {string} name Name of the attachmet to remove.
+     */
+    detach(name) {
+        const attachedFiles = this.getAttachments();
+        attachedFiles.forEach((file) => {
+            var _a, _b, _c;
+            if (file.name !== name)
+                return;
+            // the file wasn't embedded into context yet
+            if ('pdfEmbeddedFile' in file) {
+                const i = this.embeddedFiles.findIndex((f) => file.pdfEmbeddedFile === f);
+                if (i !== undefined)
+                    this.embeddedFiles.splice(i, 1);
+            }
+            else {
+                // remove references from catalog
+                const namesArr = (_a = this.catalog
+                    .Names()) === null || _a === void 0 ? void 0 : _a.lookup(PDFName.of('EmbeddedFiles'), PDFDict).lookup(PDFName.of('Names'), PDFArray);
+                const iNames = namesArr === null || namesArr === void 0 ? void 0 : namesArr.indexOf(file.specRef);
+                if (iNames !== undefined && iNames > 0) {
+                    // attachment spec ref
+                    namesArr === null || namesArr === void 0 ? void 0 : namesArr.remove(iNames);
+                    // attachment name
+                    namesArr === null || namesArr === void 0 ? void 0 : namesArr.remove(iNames - 1);
+                }
+                // AF-Tag for PDF-A3 compliance
+                const AF = this.catalog.AttachedFiles();
+                const afIndex = AF === null || AF === void 0 ? void 0 : AF.indexOf(file.specRef);
+                if (afIndex !== undefined)
+                    AF === null || AF === void 0 ? void 0 : AF.remove(afIndex);
+                // remove references from context
+                const streamRef = (_c = (_b = this.context
+                    .lookupMaybe(file.specRef, PDFDict)) === null || _b === void 0 ? void 0 : _b.lookupMaybe(PDFName.of('EF'), PDFDict)) === null || _c === void 0 ? void 0 : _c.get(PDFName.of('F'));
+                if (streamRef)
+                    this.context.delete(streamRef);
+                this.context.delete(file.specRef);
+            }
+        });
+    }
     /**
      * Embed a font into this document. The input data can be provided in multiple
      * formats:
@@ -37305,7 +37395,7 @@ class PDFDocument {
         return undefined;
     }
     takeSnapshot() {
-        const indirectObjects = [];
+        const indirectObjects = new Set();
         const snapshot = new IncrementalDocumentSnapshot(this.context.largestObjectNumber, indirectObjects, this.context.pdfFileDetails.pdfSize, this.context.pdfFileDetails.prevStartXRef, this.context);
         if (!this.context.snapshot && this.context.pdfFileDetails.originalBytes) {
             this.context.snapshot = snapshot;
@@ -38539,7 +38629,7 @@ class PDFPage {
             rotate: (_c = options.rotate) !== null && _c !== void 0 ? _c : degrees(0),
             color: (_d = options.color) !== null && _d !== void 0 ? _d : undefined,
             borderColor: (_e = options.borderColor) !== null && _e !== void 0 ? _e : undefined,
-            borderWidth: (_f = options.borderWidth) !== null && _f !== void 0 ? _f : 0,
+            borderWidth: (_f = options.borderWidth) !== null && _f !== void 0 ? _f : 1,
             borderDashArray: (_g = options.borderDashArray) !== null && _g !== void 0 ? _g : undefined,
             borderDashPhase: (_h = options.borderDashPhase) !== null && _h !== void 0 ? _h : undefined,
             borderLineCap: (_j = options.borderLineCap) !== null && _j !== void 0 ? _j : undefined,