pdf-lite 1.7.3-alpha.0 → 1.7.3

package/dist/acroform/appearance/pdf-choice-appearance-stream.d.ts

@@ -3,9 +3,6 @@ import { PdfAppearanceStream } from './pdf-appearance-stream.js';
 import type { PdfDictionary } from '../../core/objects/pdf-dictionary.js';
 import type { PdfFont } from '../../fonts/pdf-font.js';
 import { PdfFormFieldFlags } from '../fields/pdf-form-field-flags.js';
-/**
- * Appearance stream for choice fields (dropdowns, list boxes).
- */
 export declare class PdfChoiceAppearanceStream extends PdfAppearanceStream {
     constructor(ctx: {
         rect: [number, number, number, number];
@@ -18,5 +15,6 @@ export declare class PdfChoiceAppearanceStream extends PdfAppearanceStream {
         reverseEncodingMap?: Map<string, number>;
         displayOptions?: string[];
         selectedIndex?: number;
+        quadding?: number;
     });
 }

package/dist/acroform/appearance/pdf-choice-appearance-stream.js

@@ -4,6 +4,14 @@ import { PdfFormFieldFlags } from '../fields/pdf-form-field-flags.js';
 /**
  * Appearance stream for choice fields (dropdowns, list boxes).
  */
+/** Compute the X offset for a line of text given the quadding value. */
+function calcTextX(quadding, padding, availableWidth, textWidth) {
+    if (quadding === 2)
+        return padding + Math.max(availableWidth - textWidth, 0);
+    if (quadding === 1)
+        return padding + Math.max((availableWidth - textWidth) / 2, 0);
+    return padding;
+}
 export class PdfChoiceAppearanceStream extends PdfAppearanceStream {
     constructor(ctx) {
         const [x1, y1, x2, y2] = ctx.rect;
@@ -17,10 +25,14 @@ export class PdfChoiceAppearanceStream extends PdfAppearanceStream {
         const isUnicode = ctx.isUnicode ?? false;
         const reverseEncodingMap = ctx.reverseEncodingMap;
         const padding = 2;
+        const availableWidth = width - 2 * padding;
         const isCombo = new PdfFormFieldFlags(ctx.flags).combo;
+        const quadding = ctx.quadding ?? 0;
         const g = new PdfGraphics({ resolvedFonts: ctx.resolvedFonts });
         g.beginMarkedContent();
         g.save();
+        // Set DA early so measureTextWidth works for alignment calculations
+        g.setDefaultAppearance(ctx.da);
         if (!isCombo && ctx.displayOptions && ctx.displayOptions.length > 0) {
             // Listbox: render all items, highlight the selected one
             const lineHeight = ctx.da.fontSize + 4;
@@ -39,9 +51,10 @@ export class PdfChoiceAppearanceStream extends PdfAppearanceStream {
                     g.restore();
                 }
                 const textY = itemY + lineHeight * 0.25;
+                const textX = calcTextX(quadding, padding, availableWidth, g.measureTextWidth(ctx.displayOptions[i]));
                 g.beginText();
                 g.setDefaultAppearance(ctx.da);
-                g.moveTo(padding, textY);
+                g.moveTo(textX, textY);
                 g.showText(ctx.displayOptions[i], isUnicode, reverseEncodingMap);
                 g.endText();
             }
@@ -49,9 +62,10 @@ export class PdfChoiceAppearanceStream extends PdfAppearanceStream {
         else {
             // Combo (dropdown) or no options: show selected value only
             const textY = (height - ctx.da.fontSize) / 2 + ctx.da.fontSize * 0.2;
+            const textX = calcTextX(quadding, padding, availableWidth, g.measureTextWidth(ctx.value));
             g.beginText();
             g.setDefaultAppearance(ctx.da);
-            g.moveTo(padding, textY);
+            g.moveTo(textX, textY);
             g.showText(ctx.value, isUnicode, reverseEncodingMap);
             g.endText();
             if (isCombo) {

package/dist/acroform/appearance/pdf-text-appearance-stream.d.ts

@@ -21,5 +21,6 @@ export declare class PdfTextAppearanceStream extends PdfAppearanceStream {
         reverseEncodingMap?: Map<string, number>;
         markdown?: string;
         fontVariantNames?: FontVariantNames;
+        quadding?: number;
     });
 }

package/dist/acroform/appearance/pdf-text-appearance-stream.js

@@ -2,6 +2,19 @@ import { PdfDefaultAppearance } from '../fields/pdf-default-appearance.js';
 import { PdfAppearanceStream } from './pdf-appearance-stream.js';
 import { PdfGraphics } from './pdf-graphics.js';
 const DEFAULT_FONT_SIZE = 12;
+/** Compute the X offset for a line of text given the quadding value. */
+function calcTextX(quadding, padding, availableWidth, textWidth) {
+    if (quadding === 2) {
+        // Right-aligned
+        return padding + Math.max(availableWidth - textWidth, 0);
+    }
+    if (quadding === 1) {
+        // Center-aligned
+        return padding + Math.max((availableWidth - textWidth) / 2, 0);
+    }
+    // Left-aligned (default)
+    return padding;
+}
 /**
  * Appearance stream for text fields (single-line, multiline, comb).
  * Enhanced with word wrapping and automatic font scaling.
@@ -18,6 +31,7 @@ export class PdfTextAppearanceStream extends PdfAppearanceStream {
         const availableWidth = width - 2 * padding;
         const availableHeight = height - 2 * padding;
         const autoSize = ctx.da.fontSize <= 0;
+        const quadding = ctx.quadding ?? 0;
         // Create graphics with font context for text measurement
         const g = new PdfGraphics({
             resolvedFonts: ctx.resolvedFonts,
@@ -108,11 +122,18 @@ export class PdfTextAppearanceStream extends PdfAppearanceStream {
             }
             else {
                 g.beginText();
-                g.moveTo(padding, startY);
+                let prevLineX = 0;
                 for (let i = 0; i < lines.length; i++) {
-                    if (i > 0)
-                        g.moveTo(0, -renderLineHeight);
-                    g.showText(lines[i].replace(/\r/g, ''), isUnicode, reverseEncodingMap);
+                    const lineText = lines[i].replace(/\r/g, '');
+                    const lineX = calcTextX(quadding, padding, availableWidth, g.measureTextWidth(lineText));
+                    if (i === 0) {
+                        g.moveTo(lineX, startY);
+                    }
+                    else {
+                        g.moveTo(lineX - prevLineX, -renderLineHeight);
+                    }
+                    prevLineX = lineX;
+                    g.showText(lineText, isUnicode, reverseEncodingMap);
                 }
                 g.endText();
             }
@@ -126,12 +147,14 @@ export class PdfTextAppearanceStream extends PdfAppearanceStream {
                 }
             }
             const textY = (height - finalFontSize) / 2 + finalFontSize * 0.2;
+            const textWidth = g.measureTextWidth(value);
+            const textX = calcTextX(quadding, padding, availableWidth, textWidth);
             if (ctx.markdown) {
-                g.showMarkdown(ctx.markdown, isUnicode, reverseEncodingMap, padding, textY, finalFontSize);
+                g.showMarkdown(ctx.markdown, isUnicode, reverseEncodingMap, textX, textY, finalFontSize);
             }
             else {
                 g.beginText();
-                g.moveTo(padding, textY);
+                g.moveTo(textX, textY);
                 g.showText(value, isUnicode, reverseEncodingMap);
                 g.endText();
             }

package/dist/acroform/fields/pdf-choice-form-field.js

@@ -101,6 +101,7 @@ export class PdfChoiceFormField extends PdfFormField {
             reverseEncodingMap,
             displayOptions: this.options.map((opt) => opt.label),
             selectedIndex: this.selectedIndex,
+            quadding: this.quadding,
         });
         if (options?.makeReadOnly) {
             this.readOnly = true;

package/dist/acroform/fields/pdf-form-field.js

@@ -600,6 +600,7 @@ export class PdfFormField extends PdfWidgetAnnotation {
     }
     set quadding(q) {
         this.content.set('Q', new PdfNumber(q));
+        this.updateAppearance();
     }
     get defaultAppearance() {
         return (this.content.get('DA')?.as(PdfString)?.value ??

package/dist/acroform/fields/pdf-text-form-field.js

@@ -54,6 +54,7 @@ export class PdfTextFormField extends PdfFormField {
             reverseEncodingMap,
             markdown: this.markdownValue,
             fontVariantNames: variantNames,
+            quadding: this.quadding,
         });
         if (options?.makeReadOnly) {
             this.readOnly = true;

package/dist/core/decoder.js

@@ -147,7 +147,7 @@ export class PdfDecoder extends IncrementalParser {
         const postTokens = this.nextExtraTokens();
         const stream = new PdfStream({
             header,
-            original: concatUint8Arrays(...chunks),
+            original: concatUint8Arrays(chunks),
         });
         stream.preStreamDataTokens = preStreamTokens;
         stream.postStreamDataTokens = postStreamDataTokens;

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

@@ -62,7 +62,7 @@ export class PdfObject {
     /** Converts the object to a ByteArray, optionally padding to a specified length */
     toBytes(padTo) {
         const tokens = this.toTokens();
-        const byteArray = concatUint8Arrays(...tokens.map((token) => token.toBytes()));
+        const byteArray = concatUint8Arrays(tokens.map((token) => token.toBytes()));
         if (padTo) {
             const paddedArray = new Uint8Array(padTo);
             paddedArray.set(byteArray);

package/dist/core/tokeniser.js

@@ -292,7 +292,10 @@ export class PdfByteStreamTokeniser extends IncrementalParser {
         }
         // Note: If there's no EOL marker, we continue anyway (malformed PDF)
         this.inStream = true;
-        return new PdfStartStreamToken(concatUint8Arrays(stringToBytes('stream'), new Uint8Array(whitespaceBytes)));
+        return new PdfStartStreamToken(concatUint8Arrays([
+            stringToBytes('stream'),
+            new Uint8Array(whitespaceBytes),
+        ]));
     }
     nextStreamChunkToken() {
         if (!this.inStream) {

package/dist/core/tokens/comment-token.js

@@ -15,7 +15,7 @@ export class PdfCommentToken extends PdfToken {
     }
     static toBytes(comment) {
         const tokenBytes = typeof comment === 'string' ? stringToBytes(comment) : comment;
-        return concatUint8Arrays(stringToBytes('%'), tokenBytes);
+        return concatUint8Arrays([stringToBytes('%'), tokenBytes]);
     }
     static isEofCommentToken(token) {
         if (!(token instanceof PdfCommentToken))

package/dist/crypto/key-derivation/key-derivation.js

@@ -23,7 +23,7 @@ export async function computeMasterKey(password, ownerKey, permissions, id0, key
         hashInputParts.push(new Uint8Array([0xff, 0xff, 0xff, 0xff]));
     }
     // Initial MD5 hash
-    let digest = await md5(concatUint8Arrays(...hashInputParts));
+    let digest = await md5(concatUint8Arrays(hashInputParts));
     if (keyLengthBits > 40) {
         // Perform 50 iterations of MD5 rehash
         for (let i = 0; i < 50; i++) {

package/dist/crypto/key-gen/key-gen-rc4-128.js

@@ -81,9 +81,15 @@ export async function computeOValueRc4_128(ownerPassword, userPassword) {
  */
 async function computeEncryptionKeyRc4_128(userPad, oValue, permissions, id, encryptMetadata, revision = 3) {
     const perms = int32ToLittleEndianBytes(permissions);
-    let digest = await md5(concatUint8Arrays(userPad, oValue, perms, id, revision >= 4 && !encryptMetadata
-        ? new Uint8Array([0xff, 0xff, 0xff, 0xff])
-        : new Uint8Array()));
+    let digest = await md5(concatUint8Arrays([
+        userPad,
+        oValue,
+        perms,
+        id,
+        revision >= 4 && !encryptMetadata
+            ? new Uint8Array([0xff, 0xff, 0xff, 0xff])
+            : new Uint8Array(),
+    ]));
     // 50 iterations
     for (let i = 0; i < 50; i++) {
         digest = await md5(digest);
@@ -112,7 +118,7 @@ export async function computeUValueRc4_128(userPassword, oValue, permissions, id
     // Step 1: Compute encryption key
     const encryptionKey = await computeEncryptionKeyRc4_128(userPad, oValue, permissions, id, encryptMetadata, revision);
     // Step 2 & 3: MD5 of padding + file ID
-    const hash = await md5(concatUint8Arrays(DEFAULT_PADDING, id)); // 16 bytes
+    const hash = await md5(concatUint8Arrays([DEFAULT_PADDING, id])); // 16 bytes
     // Step 4: First RC4 encrypt with base key
     let data = await rc4EncryptWithKey(encryptionKey, hash);
     // Step 5: 19 more rounds of RC4 with key XOR i

package/dist/crypto/key-gen/key-gen-rc4-40.js

@@ -68,7 +68,7 @@ export async function computeORc4_40(ownerPw, userPw) {
 export async function computeEncryptionKeyRc4_40(userPw, oValue, permissions, fileId) {
     const userPad = padPassword(userPw);
     const permissionsLE = int32ToLittleEndianBytes(permissions);
-    const digest = await md5(concatUint8Arrays(userPad, oValue, permissionsLE, fileId));
+    const digest = await md5(concatUint8Arrays([userPad, oValue, permissionsLE, fileId]));
     return digest.slice(0, 5); // 40-bit key
 }
 /**

package/dist/pdf/pdf-document.js

@@ -952,7 +952,7 @@ export class PdfDocument extends PdfObject {
      */
     toBytes() {
         this.update();
-        return concatUint8Arrays(...this.revisions.map((x) => x.toBytes()));
+        return concatUint8Arrays(this.revisions.map((x) => x.toBytes()));
     }
     /**
      * Creates a deep copy of the document.

package/dist/signing/signer.js

@@ -92,7 +92,10 @@ export class PdfSigner {
             ];
             signature.setByteRange(byteRange);
             const allBytes = this.document.toBytes();
-            const toSign = concatUint8Arrays(allBytes.slice(byteRange[0], byteRange[1]), allBytes.slice(byteRange[2], byteRange[3] + byteRange[2]));
+            const toSign = concatUint8Arrays([
+                allBytes.slice(byteRange[0], byteRange[1]),
+                allBytes.slice(byteRange[2], byteRange[3] + byteRange[2]),
+            ]);
             const { signedBytes, revocationInfo } = await signature.sign({
                 bytes: toSign,
                 embedRevocationInfo: !Boolean(dss),
@@ -276,7 +279,10 @@ export class PdfSigner {
                 continue;
             }
             // Compute the bytes that were signed (excluding the signature contents)
-            const signedBytes = concatUint8Arrays(documentBytes.slice(byteRange[0], byteRange[0] + byteRange[1]), documentBytes.slice(byteRange[2], byteRange[2] + byteRange[3]));
+            const signedBytes = concatUint8Arrays([
+                documentBytes.slice(byteRange[0], byteRange[0] + byteRange[1]),
+                documentBytes.slice(byteRange[2], byteRange[2] + byteRange[3]),
+            ]);
             // Verify the signature
             const result = await signature.verify({
                 bytes: signedBytes,

package/dist/utils/concatUint8Arrays.d.ts

@@ -7,10 +7,10 @@ import { ByteArray } from '../types.js';
  *
  * @example
  * ```typescript
- * const result = concatUint8Arrays(
+ * const result = concatUint8Arrays([
  *   new Uint8Array([1, 2]),
  *   new Uint8Array([3, 4])
- * ) // Returns Uint8Array([1, 2, 3, 4])
+ * ]) // Returns Uint8Array([1, 2, 3, 4])
  * ```
  */
-export declare function concatUint8Arrays(...arrays: Uint8Array[]): ByteArray;
+export declare function concatUint8Arrays(arrays: Uint8Array[]): ByteArray;

package/dist/utils/concatUint8Arrays.js

@@ -6,19 +6,22 @@
  *
  * @example
  * ```typescript
- * const result = concatUint8Arrays(
+ * const result = concatUint8Arrays([
  *   new Uint8Array([1, 2]),
  *   new Uint8Array([3, 4])
- * ) // Returns Uint8Array([1, 2, 3, 4])
+ * ]) // Returns Uint8Array([1, 2, 3, 4])
  * ```
  */
-export function concatUint8Arrays(...arrays) {
-    const totalLength = arrays.reduce((acc, arr) => acc + arr.length, 0);
+export function concatUint8Arrays(arrays) {
+    let totalLength = 0;
+    for (let i = 0; i < arrays.length; i++) {
+        totalLength += arrays[i].length;
+    }
     const result = new Uint8Array(totalLength);
     let offset = 0;
-    for (const arr of arrays) {
-        result.set(arr, offset);
-        offset += arr.length;
+    for (let i = 0; i < arrays.length; i++) {
+        result.set(arrays[i], offset);
+        offset += arrays[i].length;
     }
     return result;
 }

package/package.json

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