pdf-lite 1.6.0 → 1.6.1

package/dist/acroform/fields/pdf-default-appearance.js

@@ -46,7 +46,7 @@ export class PdfDefaultAppearance extends PdfString {
         return `/${this._fontName} ${this._fontSize} Tf ${this._colorOp}`;
     }
     static parse(da) {
-        const fontMatch = da.match(/\/(\w+)\s+([\d.]+)\s+Tf/);
+        const fontMatch = da.match(/\/([\w-]+)\s+([\d.]+)\s+Tf/);
         if (!fontMatch)
             return null;
         const fontName = fontMatch[1];

package/dist/core/objects/pdf-stream.d.ts

@@ -94,6 +94,9 @@ export declare class PdfStream<T extends PdfDictionary = PdfDictionary> extends
     static fromString(data: string): PdfStream;
 }
 export declare class PdfObjStream extends PdfStream {
+    private _parsedObjects?;
+    set raw(data: ByteArray);
+    get raw(): ByteArray;
     constructor(options: {
         header: PdfDictionary;
         original: ByteArray | string;
@@ -101,6 +104,7 @@ export declare class PdfObjStream extends PdfStream {
     });
     static fromObjects(objects: Iterable<PdfIndirectObject>): PdfObjStream;
     getObjectStream(): Generator<PdfIndirectObject>;
+    private getParsedObjects;
     getObject(options: {
         objectNumber: number;
     }): PdfIndirectObject | undefined;

package/dist/core/objects/pdf-stream.js

@@ -486,6 +486,14 @@ export class PdfStream extends PdfObject {
     }
 }
 export class PdfObjStream extends PdfStream {
+    _parsedObjects;
+    set raw(data) {
+        super.raw = data;
+        this._parsedObjects = undefined;
+    }
+    get raw() {
+        return super.raw;
+    }
     constructor(options) {
         super(options);
         if (!this.isType('ObjStm')) {
@@ -548,8 +556,11 @@ export class PdfObjStream extends PdfStream {
             const { value: obj, done } = reader.next();
             if (done)
                 break;
-            if (obj instanceof PdfNumber) {
-                // Collect object numbers and byte offsets
+            if (obj instanceof PdfNumber &&
+                (totalObjects === 0 || numbers.length < totalObjects * 2)) {
+                // Collect object numbers and byte offsets from the header section.
+                // Stop once we have all 2*N pairs so that object values that happen
+                // to be plain integers are not mistakenly treated as header entries.
                 numbers.push(obj);
             }
             else {
@@ -574,16 +585,20 @@ export class PdfObjStream extends PdfStream {
             }
         }
     }
-    getObject(options) {
-        for (const obj of this.getObjectStream()) {
-            if (obj.objectNumber === options.objectNumber) {
-                return obj;
+    getParsedObjects() {
+        if (!this._parsedObjects) {
+            this._parsedObjects = new Map();
+            for (const obj of this.getObjectStream()) {
+                this._parsedObjects.set(obj.objectNumber, obj);
             }
         }
-        return undefined;
+        return this._parsedObjects;
+    }
+    getObject(options) {
+        return this.getParsedObjects().get(options.objectNumber);
     }
     getObjects() {
-        return Array.from(this.getObjectStream());
+        return Array.from(this.getParsedObjects().values());
     }
     cloneImpl() {
         return new PdfObjStream({

package/dist/pdf/pdf-document.d.ts

@@ -42,7 +42,9 @@ export declare class PdfDocument extends PdfObject implements IPdfObjectResolver
     private originalSecurityHandler?;
     private hasEncryptionDictionary?;
     private _resolvedCache;
+    private _objStreamCache;
     private _committing;
+    private _updating;
     private _finalized;
     private _signed;
     /**

package/dist/pdf/pdf-document.js

@@ -50,7 +50,9 @@ export class PdfDocument extends PdfObject {
     originalSecurityHandler;
     hasEncryptionDictionary = false;
     _resolvedCache = new Map();
+    _objStreamCache = new Map();
     _committing = false;
+    _updating = false;
     _finalized = false;
     _signed = false;
     /**
@@ -452,6 +454,14 @@ export class PdfDocument extends PdfObject {
                         continue;
                     }
                     if (obj.isModified()) {
+                        // Pre-register any new objects referenced by obj before
+                        // cloning so the clone gets correct object numbers.
+                        // Without this, proxy references (objectNumber = -1) get
+                        // frozen into the clone as "-1 0 R" — a dangling reference.
+                        const missing = this.collectMissingReferences(obj);
+                        if (missing.length > 0) {
+                            this.add(...missing);
+                        }
                         const adding = obj.clone();
                         this.add(adding);
                         adding.setModified(false);
@@ -573,19 +583,21 @@ export class PdfDocument extends PdfObject {
         if (!(xrefEntry instanceof PdfXRefStreamCompressedEntry)) {
             throw new Error('Cannot find object inside object stream via PdfDocument.findObject');
         }
-        const objectStreamIndirect = this.findUncompressedObject({
-            objectNumber: xrefEntry.objectStreamNumber.value,
-        })?.clone();
-        if (!objectStreamIndirect) {
-            throw new Error(`Cannot find object stream ${xrefEntry.objectStreamNumber.value} for object ${options.objectNumber}`);
-        }
-        const objectStream = objectStreamIndirect.content
-            .as(PdfStream)
-            .parseAs(PdfObjStream);
-        const decompressedObject = objectStream.getObject({
-            objectNumber: options.objectNumber,
-        });
-        return decompressedObject;
+        const streamNumber = xrefEntry.objectStreamNumber.value;
+        let objectStream = this._objStreamCache.get(streamNumber);
+        if (!objectStream) {
+            const objectStreamIndirect = this.findUncompressedObject({
+                objectNumber: streamNumber,
+            });
+            if (!objectStreamIndirect) {
+                throw new Error(`Cannot find object stream ${streamNumber} for object ${options.objectNumber}`);
+            }
+            objectStream = objectStreamIndirect.content
+                .as(PdfStream)
+                .parseAs(PdfObjStream);
+            this._objStreamCache.set(streamNumber, objectStream);
+        }
+        return objectStream.getObject({ objectNumber: options.objectNumber });
     }
     /**
      * Finds an uncompressed indirect object by its object number.
@@ -880,20 +892,28 @@ export class PdfDocument extends PdfObject {
      * Performs a full update cycle to ensure all revisions are consistent and offsets are correct.
      */
     update() {
-        this.commitIncrementalUpdates();
-        this.flushResolvedCache();
-        this.registerNewReferences();
-        this.calculateOffsets();
-        this.updateRevisions();
-        // Second pass: xref binary may have changed size (e.g. FlateDecode removed
-        // from xref stream), shifting objects that follow it. Recalculate so entry
-        // byteOffset refs hold the new positions, then rebuild the xref binary once
-        // more so the baked bytes match those positions.
-        this.calculateOffsets();
-        this.updateRevisions();
-        // Third pass: confirm positions are stable (xref binary size should not
-        // change again because W widths and entry count are the same).
-        this.calculateOffsets();
+        if (this._updating)
+            return;
+        this._updating = true;
+        try {
+            this.commitIncrementalUpdates();
+            this.flushResolvedCache();
+            this.registerNewReferences();
+            this.calculateOffsets();
+            this.updateRevisions();
+            // Second pass: xref binary may have changed size (e.g. FlateDecode removed
+            // from xref stream), shifting objects that follow it. Recalculate so entry
+            // byteOffset refs hold the new positions, then rebuild the xref binary once
+            // more so the baked bytes match those positions.
+            this.calculateOffsets();
+            this.updateRevisions();
+            // Third pass: confirm positions are stable (xref binary size should not
+            // change again because W widths and entry count are the same).
+            this.calculateOffsets();
+        }
+        finally {
+            this._updating = false;
+        }
     }
     /**
      * Walks all objects in the document and registers any newly created
@@ -907,9 +927,11 @@ export class PdfDocument extends PdfObject {
         }
     }
     flushResolvedCache() {
+        const existing = new Set(this.objects);
         for (const [, obj] of this._resolvedCache) {
-            if (obj.isModified() && !this.objects.includes(obj)) {
+            if (obj.isModified() && !existing.has(obj)) {
                 this.add(obj);
+                existing.add(obj);
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdf-lite",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "main": "dist/index.js",
   "type": "module",
   "exports": {