pdf-lite 1.5.0 → 1.6.1

package/dist/core/ref.js

@@ -16,7 +16,7 @@ export class Ref {
     value;
     /** Registered callbacks for update notifications */
     callbacks = [];
-    isModified = false;
+    modified = true;
     immutable = false;
     /**
      * Creates a new Ref with an initial value.
@@ -30,6 +30,12 @@ export class Ref {
         }
         this.value = value;
     }
+    isModified() {
+        return this.modified;
+    }
+    setModified(modified = true) {
+        this.modified = modified;
+    }
     setImmutable(immutable = true) {
         this.immutable = immutable;
     }
@@ -49,10 +55,7 @@ export class Ref {
         const resolvedNewValue = newValue instanceof Ref ? newValue.resolve() : newValue;
         const oldValue = this.resolve();
         if (oldValue !== resolvedNewValue) {
-            if (this.immutable) {
-                throw new Error(`Cannot update an immutable Ref (${oldValue} -> ${resolvedNewValue})`);
-            }
-            this.isModified = true;
+            this.modified = true;
         }
         this.value = newValue;
         this.callbacks.forEach((cb) => cb(oldValue, this.resolve()));

package/dist/core/tokens/token.d.ts

@@ -1,5 +1,5 @@
 import { ByteArray } from '../../types.js';
-export declare abstract class PdfToken {
+export declare class PdfToken {
     protected rawBytes: ByteArray;
     constructor(bytes?: ByteArray);
     toBytes(): ByteArray;
@@ -7,4 +7,5 @@ export declare abstract class PdfToken {
     get type(): string;
     get byteLength(): number;
     equals(other: PdfToken): boolean;
+    clone(): PdfToken;
 }

package/dist/core/tokens/token.js

@@ -29,4 +29,7 @@ export class PdfToken {
         }
         return true;
     }
+    clone() {
+        return new PdfToken(this.toBytes());
+    }
 }

package/dist/fonts/index.d.ts

@@ -1,4 +1,3 @@
 export * from './types.js';
-export * from './manager.js';
 export * from './pdf-font.js';
 export * from './parsers/index.js';

package/dist/fonts/index.js

@@ -1,4 +1,3 @@
 export * from './types.js';
-export * from './manager.js';
 export * from './pdf-font.js';
 export * from './parsers/index.js';

package/dist/fonts/pdf-font.d.ts

@@ -4,15 +4,9 @@ import { PdfName } from '../core/objects/pdf-name.js';
 import { PdfNumber } from '../core/objects/pdf-number.js';
 import { PdfArray } from '../core/objects/pdf-array.js';
 import { PdfObjectReference } from '../core/objects/pdf-object-reference.js';
-import type { PdfFontManager } from './manager.js';
 import type { FontDescriptor, UnicodeFontDescriptor, FontParser } from './types.js';
 import type { ByteArray } from '../types.js';
-type PdfStandardFontName = 'Helvetica' | 'Helvetica-Bold' | 'Helvetica-Oblique' | 'Helvetica-BoldOblique' | 'Times-Roman' | 'Times-Bold' | 'Times-Italic' | 'Times-BoldItalic' | 'Courier' | 'Courier-Bold' | 'Courier-Oblique' | 'Courier-BoldOblique' | 'Symbol' | 'ZapfDingbats';
-/**
- * Represents an embedded font in a PDF document.
- * Extends PdfDictionary to provide both font metadata and PDF dictionary structure.
- */
-export declare class PdfFont extends PdfDictionary<{
+type PdfFontDictionary = PdfDictionary<{
     Type: PdfName<'Font'>;
     Subtype: PdfName<'Type1' | 'TrueType' | 'Type0'>;
     BaseFont: PdfName;
@@ -23,22 +17,20 @@ export declare class PdfFont extends PdfDictionary<{
     Widths?: PdfArray<PdfNumber>;
     DescendantFonts?: PdfArray<PdfObjectReference>;
     ToUnicode?: PdfObjectReference;
-}> {
+}>;
+type PdfStandardFontName = 'Helvetica' | 'Helvetica-Bold' | 'Helvetica-Oblique' | 'Helvetica-BoldOblique' | 'Times-Roman' | 'Times-Bold' | 'Times-Italic' | 'Times-BoldItalic' | 'Courier' | 'Courier-Bold' | 'Courier-Oblique' | 'Courier-BoldOblique' | 'Symbol' | 'ZapfDingbats';
+/**
+ * Represents an embedded font in a PDF document.
+ * Extends PdfIndirectObject with a PdfDictionary content for the font dict.
+ */
+export declare class PdfFont extends PdfIndirectObject<PdfFontDictionary> {
     /**
      * The PDF resource name used in content streams (e.g., 'F1', 'F2').
      * This is the identifier used in PDF operators like `/F1 12 Tf`.
      */
     resourceName: string;
-    /**
-     * Reference to the container indirect object that wraps this font dict.
-     * Set by FontManager.write() when the font is committed to the PDF.
-     */
-    container?: PdfIndirectObject;
-    /**
-     * Auxiliary objects that must be committed along with the font dict.
-     * Includes FontDescriptor, FontFile2, CIDFont, ToUnicode, etc.
-     */
-    protected auxiliaryObjects: PdfIndirectObject[];
+    private static _resourceCounter;
+    private static nextResourceName;
     /**
      * @internal
      * Font descriptor with metrics and properties.
@@ -49,21 +41,34 @@ export declare class PdfFont extends PdfDictionary<{
      * Original font file bytes.
      */
     private _fontData?;
+    constructor(font: PdfIndirectObject);
     constructor(fontName: string);
     constructor(options: {
-        dict?: PdfDictionary;
         fontName?: string;
         resourceName?: string;
         encoding?: string;
-        manager?: PdfFontManager;
-        container?: PdfIndirectObject;
         descriptor?: FontDescriptor | UnicodeFontDescriptor;
         fontData?: ByteArray;
     });
+    get dict(): PdfFontDictionary;
     get fontName(): string | undefined;
     set fontName(name: string | undefined);
     get encoding(): string | undefined;
     set encoding(enc: string | undefined);
+    /**
+     * Gets the encoding map from the font's Encoding dictionary's Differences array.
+     * Maps byte codes to Unicode characters for custom-encoded fonts.
+     */
+    get encodingMap(): Map<number, string> | null;
+    /**
+     * Gets the reverse encoding map (Unicode character → byte code).
+     * Useful for encoding text back into the font's custom encoding.
+     */
+    get reverseEncodingMap(): Map<string, number> | undefined;
+    /**
+     * Whether this font uses Unicode (Type0/composite) encoding.
+     */
+    get isUnicode(): boolean;
     /**
      * Gets the font descriptor with metrics and properties.
      * Available for embedded fonts, undefined for standard fonts or loaded fonts without descriptor.
@@ -147,15 +152,10 @@ export declare class PdfFont extends PdfDictionary<{
      * ```
      */
     toString(): string;
-    /**
-     * Returns all objects that need to be committed to the PDF.
-     * Includes auxiliary objects (descriptors, streams) and the container.
-     */
-    getObjectsToCommit(): PdfIndirectObject[];
     /**
      * @internal
      * Legacy property for backward compatibility with code that accesses fontRef.
-     * Returns the container object if available.
+     * Returns this font's reference since PdfFont IS the indirect object.
      */
     get fontRef(): PdfObjectReference;
     /**
@@ -230,6 +230,11 @@ export declare class PdfFont extends PdfDictionary<{
      * @returns A PdfFont instance ready to be written to the PDF
      */
     static fromType0Data(fontData: ByteArray, fontName: string, descriptor: UnicodeFontDescriptor, unicodeMappings?: Map<number, number>): PdfFont;
+    static fromFile(fontData: ByteArray, options?: {
+        fontName?: string;
+        unicode?: boolean;
+        unicodeMappings?: Map<number, number>;
+    }): PdfFont;
     /**
      * Generates a ToUnicode CMap for mapping CIDs to Unicode code points.
      */

package/dist/fonts/pdf-font.js

@@ -4,29 +4,25 @@ import { PdfName } from '../core/objects/pdf-name.js';
 import { PdfNumber } from '../core/objects/pdf-number.js';
 import { PdfArray } from '../core/objects/pdf-array.js';
 import { PdfStream } from '../core/objects/pdf-stream.js';
+import { PdfObjectReference } from '../core/objects/pdf-object-reference.js';
 import { PdfString } from '../core/objects/pdf-string.js';
+import { buildEncodingMap } from '../utils/decodeWithFontEncoding.js';
 import { parseFont } from './parsers/font-parser.js';
 import { OtfParser } from './parsers/otf-parser.js';
 /**
  * Represents an embedded font in a PDF document.
- * Extends PdfDictionary to provide both font metadata and PDF dictionary structure.
+ * Extends PdfIndirectObject with a PdfDictionary content for the font dict.
  */
-export class PdfFont extends PdfDictionary {
+export class PdfFont extends PdfIndirectObject {
     /**
      * The PDF resource name used in content streams (e.g., 'F1', 'F2').
      * This is the identifier used in PDF operators like `/F1 12 Tf`.
      */
     resourceName;
-    /**
-     * Reference to the container indirect object that wraps this font dict.
-     * Set by FontManager.write() when the font is committed to the PDF.
-     */
-    container;
-    /**
-     * Auxiliary objects that must be committed along with the font dict.
-     * Includes FontDescriptor, FontFile2, CIDFont, ToUnicode, etc.
-     */
-    auxiliaryObjects = [];
+    static _resourceCounter = 0;
+    static nextResourceName() {
+        return `F${++PdfFont._resourceCounter}`;
+    }
     /**
      * @internal
      * Font descriptor with metrics and properties.
@@ -38,27 +34,36 @@ export class PdfFont extends PdfDictionary {
      */
     _fontData;
     constructor(optionsOrFontName) {
-        super();
+        super(new PdfIndirectObject({ content: new PdfDictionary() }));
+        if (optionsOrFontName instanceof PdfIndirectObject) {
+            // Handle PdfIndirectObject input (existing font object)
+            const fontObj = optionsOrFontName;
+            if (!(fontObj.content instanceof PdfDictionary)) {
+                throw new Error('PdfIndirectObject content must be a PdfDictionary');
+            }
+            this.content = fontObj.content;
+            this.resourceName = fontObj.reference.key;
+            return;
+        }
         // Handle string parameter (simple fontName)
         if (typeof optionsOrFontName === 'string') {
             this.fontName = optionsOrFontName;
             this.resourceName = optionsOrFontName;
             return;
         }
-        // Handle options object (existing behavior)
+        // Handle options object
         const options = optionsOrFontName;
-        if (options.dict) {
-            this.copyFrom(options.dict);
-        }
         this.fontName = options.fontName;
-        this.resourceName = options.resourceName ?? '';
+        this.resourceName = options.resourceName || PdfFont.nextResourceName();
         this.encoding = options.encoding;
-        this.container = options.container;
         this._descriptor = options.descriptor;
         this._fontData = options.fontData;
     }
+    get dict() {
+        return this.content;
+    }
     get fontName() {
-        const baseFont = this.get('BaseFont');
+        const baseFont = this.content.get('BaseFont');
         if (!baseFont) {
             return undefined;
         }
@@ -66,23 +71,52 @@ export class PdfFont extends PdfDictionary {
     }
     set fontName(name) {
         if (!name) {
-            this.delete('BaseFont');
+            this.content.delete('BaseFont');
             return;
         }
-        this.set('BaseFont', new PdfName(name));
+        this.content.set('BaseFont', new PdfName(name));
     }
     get encoding() {
-        const encoding = this.get('Encoding');
+        const encoding = this.content.get('Encoding');
         return encoding ? encoding.value : undefined;
     }
     set encoding(enc) {
         if (enc) {
-            this.set('Encoding', new PdfName(enc));
+            this.content.set('Encoding', new PdfName(enc));
         }
         else {
-            this.delete('Encoding');
+            this.content.delete('Encoding');
         }
     }
+    /**
+     * Gets the encoding map from the font's Encoding dictionary's Differences array.
+     * Maps byte codes to Unicode characters for custom-encoded fonts.
+     */
+    get encodingMap() {
+        const enc = this.content.get('Encoding');
+        const encObj = enc instanceof PdfObjectReference ? enc.resolve()?.content : enc;
+        const encDict = encObj instanceof PdfDictionary ? encObj : undefined;
+        const diffs = encDict?.get('Differences')?.as(PdfArray);
+        if (!diffs)
+            return null;
+        return buildEncodingMap(diffs);
+    }
+    /**
+     * Gets the reverse encoding map (Unicode character → byte code).
+     * Useful for encoding text back into the font's custom encoding.
+     */
+    get reverseEncodingMap() {
+        const map = this.encodingMap;
+        if (!map)
+            return undefined;
+        return new Map(Array.from(map, ([code, char]) => [char, code]));
+    }
+    /**
+     * Whether this font uses Unicode (Type0/composite) encoding.
+     */
+    get isUnicode() {
+        return this.fontType === 'Type0';
+    }
     /**
      * Gets the font descriptor with metrics and properties.
      * Available for embedded fonts, undefined for standard fonts or loaded fonts without descriptor.
@@ -101,7 +135,7 @@ export class PdfFont extends PdfDictionary {
      * Gets the font type (Subtype in PDF).
      */
     get fontType() {
-        const subtype = this.get('Subtype');
+        const subtype = this.content.get('Subtype');
         return subtype?.value;
     }
     /**
@@ -109,17 +143,17 @@ export class PdfFont extends PdfDictionary {
      */
     set fontType(type) {
         if (type) {
-            this.set('Subtype', new PdfName(type));
+            this.content.set('Subtype', new PdfName(type));
         }
         else {
-            this.delete('Subtype');
+            this.content.delete('Subtype');
         }
     }
     /**
      * Gets the first character code in the Widths array.
      */
     get firstChar() {
-        const firstChar = this.get('FirstChar');
+        const firstChar = this.content.get('FirstChar');
         return firstChar?.value;
     }
     /**
@@ -127,17 +161,17 @@ export class PdfFont extends PdfDictionary {
      */
     set firstChar(value) {
         if (value !== undefined) {
-            this.set('FirstChar', new PdfNumber(value));
+            this.content.set('FirstChar', new PdfNumber(value));
         }
         else {
-            this.delete('FirstChar');
+            this.content.delete('FirstChar');
         }
     }
     /**
      * Gets the last character code in the Widths array.
      */
     get lastChar() {
-        const lastChar = this.get('LastChar');
+        const lastChar = this.content.get('LastChar');
         return lastChar?.value;
     }
     /**
@@ -145,17 +179,17 @@ export class PdfFont extends PdfDictionary {
      */
     set lastChar(value) {
         if (value !== undefined) {
-            this.set('LastChar', new PdfNumber(value));
+            this.content.set('LastChar', new PdfNumber(value));
         }
         else {
-            this.delete('LastChar');
+            this.content.delete('LastChar');
         }
     }
     /**
      * Gets the character widths array.
      */
     get widths() {
-        const widths = this.get('Widths');
+        const widths = this.content.get('Widths');
         if (!widths)
             return undefined;
         return widths.items.map((item) => item.value);
@@ -165,10 +199,10 @@ export class PdfFont extends PdfDictionary {
      */
     set widths(values) {
         if (values) {
-            this.set('Widths', new PdfArray(values.map((w) => new PdfNumber(w))));
+            this.content.set('Widths', new PdfArray(values.map((w) => new PdfNumber(w))));
         }
         else {
-            this.delete('Widths');
+            this.content.delete('Widths');
         }
     }
     /**
@@ -235,27 +269,13 @@ export class PdfFont extends PdfDictionary {
     toString() {
         return this.resourceName;
     }
-    /**
-     * Returns all objects that need to be committed to the PDF.
-     * Includes auxiliary objects (descriptors, streams) and the container.
-     */
-    getObjectsToCommit() {
-        const objects = [...this.auxiliaryObjects];
-        if (this.container) {
-            objects.push(this.container);
-        }
-        return objects;
-    }
     /**
      * @internal
      * Legacy property for backward compatibility with code that accesses fontRef.
-     * Returns the container object if available.
+     * Returns this font's reference since PdfFont IS the indirect object.
      */
     get fontRef() {
-        if (!this.container) {
-            throw new Error('Font has not been written to PDF yet');
-        }
-        return this.container.reference;
+        return this.reference;
     }
     /**
      * Creates a PdfFont from font file bytes.
@@ -297,9 +317,9 @@ export class PdfFont extends PdfDictionary {
     static fromStandardFont(fontName, widths) {
         const font = new PdfFont({ fontName });
         // Build Type1 font dictionary
-        font.set('Type', new PdfName('Font'));
-        font.set('Subtype', new PdfName('Type1'));
-        font.set('BaseFont', new PdfName(fontName));
+        font.content.set('Type', new PdfName('Font'));
+        font.content.set('Subtype', new PdfName('Type1'));
+        font.content.set('BaseFont', new PdfName(fontName));
         if (widths) {
             font.firstChar = 32;
             font.lastChar = 32 + widths.length - 1;
@@ -473,28 +493,26 @@ export class PdfFont extends PdfDictionary {
         const fontDescriptorObject = new PdfIndirectObject({
             content: fontDescriptorDict,
         });
-        // Store auxiliary objects
-        font.auxiliaryObjects.push(fontFileObject, fontDescriptorObject);
         // Build TrueType font dictionary
-        font.set('Type', new PdfName('Font'));
-        font.set('Subtype', new PdfName('TrueType'));
-        font.set('BaseFont', new PdfName(descriptor.fontName));
-        font.set('FontDescriptor', fontDescriptorObject.reference);
-        font.set('Encoding', new PdfName('WinAnsiEncoding'));
+        font.content.set('Type', new PdfName('Font'));
+        font.content.set('Subtype', new PdfName('TrueType'));
+        font.content.set('BaseFont', new PdfName(descriptor.fontName));
+        font.content.set('FontDescriptor', fontDescriptorObject.reference);
+        font.content.set('Encoding', new PdfName('WinAnsiEncoding'));
         // Add width information for proper glyph rendering
         const firstChar = descriptor.firstChar ?? 32;
         const lastChar = descriptor.lastChar ?? 255;
-        font.set('FirstChar', new PdfNumber(firstChar));
-        font.set('LastChar', new PdfNumber(lastChar));
+        font.content.set('FirstChar', new PdfNumber(firstChar));
+        font.content.set('LastChar', new PdfNumber(lastChar));
         if (descriptor.widths) {
-            font.set('Widths', new PdfArray(descriptor.widths.map((w) => new PdfNumber(w))));
+            font.content.set('Widths', new PdfArray(descriptor.widths.map((w) => new PdfNumber(w))));
         }
         else {
             // Default: 1000 (standard em-square)
             const defaultWidths = Array(lastChar - firstChar + 1)
                 .fill(0)
                 .map(() => new PdfNumber(1000));
-            font.set('Widths', new PdfArray(defaultWidths));
+            font.content.set('Widths', new PdfArray(defaultWidths));
         }
         return font;
     }
@@ -547,8 +565,6 @@ export class PdfFont extends PdfDictionary {
         const fontDescriptorObject = new PdfIndirectObject({
             content: fontDescriptorDict,
         });
-        // Store descriptor and font file
-        font.auxiliaryObjects.push(fontFileObject, fontDescriptorObject);
         // Create CIDFont dictionary (descendant font)
         const cidFontDict = new PdfDictionary();
         cidFontDict.set('Type', new PdfName('Font'));
@@ -571,13 +587,12 @@ export class PdfFont extends PdfDictionary {
         const cidFontObject = new PdfIndirectObject({
             content: cidFontDict,
         });
-        font.auxiliaryObjects.push(cidFontObject);
         // Build Type0 font dictionary
-        font.set('Type', new PdfName('Font'));
-        font.set('Subtype', new PdfName('Type0'));
-        font.set('BaseFont', new PdfName(`${descriptor.fontName}-Identity-H`));
-        font.set('Encoding', new PdfName('Identity-H'));
-        font.set('DescendantFonts', new PdfArray([cidFontObject.reference]));
+        font.content.set('Type', new PdfName('Font'));
+        font.content.set('Subtype', new PdfName('Type0'));
+        font.content.set('BaseFont', new PdfName(`${descriptor.fontName}-Identity-H`));
+        font.content.set('Encoding', new PdfName('Identity-H'));
+        font.content.set('DescendantFonts', new PdfArray([cidFontObject.reference]));
         // Create ToUnicode CMap if mappings provided
         if (unicodeMappings && unicodeMappings.size > 0) {
             const cmapContent = PdfFont.generateToUnicodeCMap(unicodeMappings);
@@ -589,11 +604,34 @@ export class PdfFont extends PdfDictionary {
             const cmapObject = new PdfIndirectObject({
                 content: cmapStream,
             });
-            font.set('ToUnicode', cmapObject.reference);
-            font.auxiliaryObjects.push(cmapObject);
+            font.content.set('ToUnicode', cmapObject.reference);
         }
         return font;
     }
+    static fromFile(fontData, options) {
+        // Parse the font to extract metadata
+        const parser = parseFont(fontData);
+        const info = parser.getFontInfo();
+        // Auto-generate font name from metadata if not provided
+        const fontName = options?.fontName ?? info.postScriptName ?? info.fullName;
+        // Get the appropriate descriptor based on unicode option
+        const descriptor = parser.getFontDescriptor(fontName);
+        // Embed using the appropriate method and return PdfFont
+        if (options?.unicode) {
+            // For Unicode fonts, we need a UnicodeFontDescriptor
+            // Create one by extending the base descriptor
+            const unicodeDescriptor = {
+                ...descriptor,
+                defaultWidth: 1000,
+                cidToGidMap: 'Identity',
+            };
+            return PdfFont.fromType0Data(fontData, fontName, unicodeDescriptor, options.unicodeMappings);
+        }
+        else {
+            // Use standard TrueType embedding
+            return PdfFont.fromTrueTypeData(fontData, fontName, descriptor);
+        }
+    }
     /**
      * Generates a ToUnicode CMap for mapping CIDs to Unicode code points.
      */

package/dist/pdf/index.d.ts

@@ -1,4 +1,6 @@
 export * from './pdf-document.js';
+export * from './pdf-page.js';
+export * from './pdf-pages.js';
 export * from './pdf-reader.js';
 export * from './pdf-revision.js';
 export * from './pdf-xref-lookup.js';

package/dist/pdf/index.js

@@ -1,4 +1,6 @@
 export * from './pdf-document.js';
+export * from './pdf-page.js';
+export * from './pdf-pages.js';
 export * from './pdf-reader.js';
 export * from './pdf-revision.js';
 export * from './pdf-xref-lookup.js';