@libpdf/core 0.0.1-beta.13 → 0.0.1-beta.14

package/dist/index.d.mts

@@ -5895,6 +5895,16 @@ interface RemoveAnnotationsOptions {
 interface FlattenAnnotationsOptions {
   /** Annotation types to exclude from flattening */
   exclude?: AnnotationSubtype[];
+  /**
+   * Remove Link annotations instead of keeping them.
+   *
+   * Link annotations contain URI or other actions that Adobe considers
+   * "hidden behavior" which can cause signature validation warnings.
+   * Enable this option when preparing documents for signing.
+   *
+   * @default false
+   */
+  removeLinks?: boolean;
 }
 //#endregion
 //#region src/attachments/types.d.ts
@@ -7684,6 +7694,24 @@ declare class PDF {
   static merge(sources: Uint8Array[], options?: MergeOptions): Promise<PDF>;
   /** PDF version string (e.g., "1.7", "2.0") */
   get version(): string;
+  /**
+   * Upgrade the PDF version.
+   *
+   * Sets the /Version entry in the catalog dictionary. This is the standard
+   * way to upgrade PDF version in incremental updates since the header
+   * cannot be modified.
+   *
+   * The version will only be upgraded if the new version is higher than
+   * the current version.
+   *
+   * @param version - Target version (e.g., "1.7", "2.0")
+   *
+   * @example
+   * ```typescript
+   * pdf.upgradeVersion("1.7");
+   * ```
+   */
+  upgradeVersion(version: string): void;
   /** Whether the document is encrypted */
   get isEncrypted(): boolean;
   /** Whether authentication succeeded (for encrypted docs) */
@@ -8619,12 +8647,6 @@ declare class PDF {
    * Used by signing to chain incremental updates.
    */
   private saveInternal;
-  /**
-   * Ensure all reachable objects are loaded into the registry.
-   *
-   * Walks from the catalog to load all referenced objects.
-   */
-  private ensureObjectsLoaded;
 }
 //#endregion
 //#region src/signatures/signers/crypto-key.d.ts

package/dist/index.mjs

@@ -9,7 +9,7 @@ import { createCMSECDSASignature } from "pkijs";
 import { base64 } from "@scure/base";
 
 //#region package.json
-var version = "0.0.1-beta.13";
+var version = "0.0.1-beta.14";
 
 //#endregion
 //#region src/objects/pdf-array.ts
@@ -26270,6 +26270,11 @@ var AnnotationFlattener = class {
 			if (isPopupAnnotation(annotDict)) continue;
 			const subtype = annotDict.getName("Subtype")?.value;
 			if (!subtype) continue;
+			if (subtype === "Link") {
+				if (options.removeLinks) {
+					if (annotRef) refsToRemove.add(`${annotRef.objectNumber} ${annotRef.generation}`);
+				}
+			}
 			if (NON_FLATTENABLE_TYPES.includes(subtype)) continue;
 			if (options.exclude?.includes(subtype)) continue;
 			const annotation = createAnnotation(annotDict, annotRef, this.registry);
@@ -26295,7 +26300,8 @@ var AnnotationFlattener = class {
 			}
 			this.normalizeAppearanceStream(appearance);
 			const xObjectName = `FlatAnnot${xObjectIndex++}`;
-			const appearanceRef = this.registry.register(appearance);
+			let appearanceRef = this.registry.getRef(appearance);
+			if (!appearanceRef) appearanceRef = this.registry.register(appearance);
 			xObjects.set(xObjectName, appearanceRef);
 			const rect = this.getAnnotationRect(annotDict);
 			const matrix = this.calculateTransformMatrix(rect, appearance);
@@ -26320,7 +26326,6 @@ var AnnotationFlattener = class {
 	* Generate appearance for annotation types we support.
 	*/
 	generateAppearance(annotation) {
-		annotation.type;
 		const rect = annotation.rect;
 		if (annotation instanceof PDFHighlightAnnotation) {
 			const highlight = annotation;
@@ -26512,22 +26517,42 @@ var AnnotationFlattener = class {
 	}
 	/**
 	* Remove specific annotations from page.
+	*
+	* IMPORTANT: If Annots is an indirect reference, we modify the array in-place
+	* to preserve the indirection. This is critical for signing: if we convert
+	* an indirect Annots to a direct array, then later signing will convert it
+	* back to indirect, modifying the page object and potentially breaking
+	* signature validation.
 	*/
 	removeAnnotations(page, toRemove) {
 		if (toRemove.size === 0) return;
-		let annots = page.get("Annots");
-		if (annots instanceof PdfRef) annots = this.registry.resolve(annots) ?? void 0;
-		if (!(annots instanceof PdfArray)) return;
-		const remaining = [];
+		const annotsEntry = page.get("Annots");
+		if (!annotsEntry) return;
+		const wasIndirect = annotsEntry instanceof PdfRef;
+		let annots;
+		if (annotsEntry instanceof PdfRef) {
+			const resolved = this.registry.resolve(annotsEntry);
+			annots = resolved instanceof PdfArray ? resolved : void 0;
+		} else if (annotsEntry instanceof PdfArray) annots = annotsEntry;
+		if (!annots) return;
+		const indicesToRemove = [];
 		for (let i = 0; i < annots.length; i++) {
 			const item = annots.at(i);
 			if (item instanceof PdfRef) {
 				const key$1 = `${item.objectNumber} ${item.generation}`;
-				if (!toRemove.has(key$1)) remaining.push(item);
+				if (toRemove.has(key$1)) indicesToRemove.push(i);
 			}
 		}
-		if (remaining.length === 0) page.delete("Annots");
-		else if (remaining.length < annots.length) page.set("Annots", PdfArray.of(...remaining));
+		if (indicesToRemove.length === 0) return;
+		if (wasIndirect) for (let i = indicesToRemove.length - 1; i >= 0; i--) annots.remove(indicesToRemove[i]);
+		else {
+			const remaining = [];
+			for (let i = 0; i < annots.length; i++) if (!indicesToRemove.includes(i)) {
+				const item = annots.at(i);
+				if (item instanceof PdfRef) remaining.push(item);
+			}
+			page.set("Annots", PdfArray.of(...remaining));
+		}
 	}
 };
 
@@ -30298,7 +30323,11 @@ var XRefParser = class {
 		const entries = /* @__PURE__ */ new Map();
 		this.expectKeyword("xref");
 		this.skipWhitespaceFromCurrent();
-		while (!this.peekKeyword("trailer")) this.parseSubsection(entries);
+		while (true) {
+			this.skipWhitespaceFromCurrent();
+			if (this.peekKeyword("trailer")) break;
+			this.parseSubsection(entries);
+		}
 		this.expectKeyword("trailer");
 		this.skipWhitespaceFromCurrent();
 		const result = new ObjectParser(new TokenReader(this.scanner)).parseObject();
@@ -31352,6 +31381,30 @@ function encryptStreamDict(stream, ctx) {
 	return encrypted;
 }
 /**
+* Collect all refs reachable from the document root and trailer entries.
+*
+* Walks the object graph starting from Root, Info, and Encrypt (if present),
+* returning the set of all object keys (as "objNum gen" strings) that are reachable.
+* This is used for garbage collection during full saves.
+*/
+function collectReachableRefs(registry, root, info, encrypt) {
+	const visited = /* @__PURE__ */ new Set();
+	const walk = (obj) => {
+		if (obj === null) return;
+		if (obj instanceof PdfRef) {
+			const key$1 = `${obj.objectNumber} ${obj.generation}`;
+			if (visited.has(key$1)) return;
+			visited.add(key$1);
+			walk(registry.resolve(obj));
+		} else if (obj instanceof PdfDict) for (const [, value] of obj) walk(value);
+		else if (obj instanceof PdfArray) for (const item of obj) walk(item);
+	};
+	walk(root);
+	if (info) walk(info);
+	if (encrypt) walk(encrypt);
+	return visited;
+}
+/**
 * Write a complete PDF from scratch.
 *
 * Structure:
@@ -31386,9 +31439,10 @@ function writeComplete(registry, options) {
 		10
 	]));
 	const offsets = /* @__PURE__ */ new Map();
-	const allObjects = /* @__PURE__ */ new Map();
-	for (const [ref, obj] of registry.entries()) allObjects.set(ref, obj);
-	for (const [ref, obj] of allObjects) {
+	const reachableKeys = collectReachableRefs(registry, options.root, options.info, options.encrypt);
+	for (const [ref, obj] of registry.entries()) {
+		const key$1 = `${ref.objectNumber} ${ref.generation}`;
+		if (!reachableKeys.has(key$1)) continue;
 		let prepared = prepareObjectForWrite(obj, compress);
 		if (options.securityHandler && options.encrypt && ref !== options.encrypt) prepared = encryptObject(prepared, {
 			handler: options.securityHandler,
@@ -37639,6 +37693,33 @@ var PDF = class PDF {
 	get version() {
 		return this.ctx.info.version;
 	}
+	/**
+	* Upgrade the PDF version.
+	*
+	* Sets the /Version entry in the catalog dictionary. This is the standard
+	* way to upgrade PDF version in incremental updates since the header
+	* cannot be modified.
+	*
+	* The version will only be upgraded if the new version is higher than
+	* the current version.
+	*
+	* @param version - Target version (e.g., "1.7", "2.0")
+	*
+	* @example
+	* ```typescript
+	* pdf.upgradeVersion("1.7");
+	* ```
+	*/
+	upgradeVersion(version$1) {
+		const parseVersion$1 = (v) => {
+			const [major, minor] = v.split(".").map(Number);
+			return major * 10 + (minor || 0);
+		};
+		const currentVersion = parseVersion$1(this.ctx.info.version);
+		if (parseVersion$1(version$1) <= currentVersion) return;
+		this.ctx.catalog.getDict().set("Version", PdfName.of(version$1));
+		this.ctx.info.version = version$1;
+	}
 	/** Whether the document is encrypted */
 	get isEncrypted() {
 		return this.ctx.info.isEncrypted;
@@ -39019,7 +39100,11 @@ var PDF = class PDF {
 			formFields = form.getFields().length;
 			form.flatten(options?.form);
 		}
-		const annotations = this.flattenAnnotations(options?.annotations);
+		const annotationOptions = {
+			removeLinks: true,
+			...options?.annotations
+		};
+		const annotations = this.flattenAnnotations(annotationOptions);
 		return {
 			layers: layerResult.layerCount,
 			formFields,
@@ -39179,7 +39264,6 @@ var PDF = class PDF {
 			this._pendingSecurity = { action: "none" };
 			return result$1;
 		}
-		this.ensureObjectsLoaded();
 		const result = writeComplete(this.ctx.registry, {
 			version: this.ctx.info.version,
 			root,
@@ -39192,28 +39276,6 @@ var PDF = class PDF {
 		this._pendingSecurity = { action: "none" };
 		return result;
 	}
-	/**
-	* Ensure all reachable objects are loaded into the registry.
-	*
-	* Walks from the catalog to load all referenced objects.
-	*/
-	ensureObjectsLoaded() {
-		const visited = /* @__PURE__ */ new Set();
-		const walk = (obj) => {
-			if (obj === null) return;
-			if (obj instanceof PdfRef) {
-				const key$1 = `${obj.objectNumber} ${obj.generation}`;
-				if (visited.has(key$1)) return;
-				visited.add(key$1);
-				walk(this.getObject(obj));
-			} else if (obj instanceof PdfDict) for (const [, value] of obj) walk(value);
-			else if (obj instanceof PdfArray) for (const item of obj) walk(item);
-		};
-		const root = this.ctx.info.trailer.getRef("Root");
-		if (root) walk(root);
-		const infoRef = this.ctx.info.trailer.getRef("Info");
-		if (infoRef) walk(infoRef);
-	}
 };
 
 //#endregion