pdf-parser.js 5.2.26 → 5.2.28

package/dist/matrix.js

@@ -47,8 +47,9 @@ function scaleMatrix(sx, sy) {
 	];
 }
 const BEZIER_KAPPA = .5522847498;
+const DEGREES_PER_HALF_TURN = 180;
 function rotationMatrix(degrees) {
-	const radians = degrees * Math.PI / 180;
+	const radians = degrees * Math.PI / DEGREES_PER_HALF_TURN;
 	const cos = Math.cos(radians);
 	const sin = Math.sin(radians);
 	return [
@@ -67,7 +68,7 @@ function matrixScaleY(m) {
 	return Math.hypot(m[2], m[3]);
 }
 function matrixRotationDegrees(m) {
-	return Math.atan2(m[1], m[0]) * 180 / Math.PI;
+	return Math.atan2(m[1], m[0]) * DEGREES_PER_HALF_TURN / Math.PI;
 }
 function rotatePointAboutCenter(point, center, degrees) {
 	const relative = {

package/dist/measure.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_afm_widths = require("./afm-widths-BYiX2L9D.cjs");
+const require_afm_widths = require("./afm-widths-BHD2HZIL.cjs");
 const require_embedded_font = require("./embedded-font.cjs");
 const require_font_registry = require("./font-registry.cjs");
 //#region src/measure.ts

package/dist/measure.js

@@ -1,4 +1,4 @@
-import { h as encodeForShow, t as STANDARD_METRICS } from "./afm-widths-blUDDjlI.js";
+import { h as encodeForShow, t as STANDARD_METRICS } from "./afm-widths-B_IGbGky.js";
 import { encodeForShowEmbedded } from "./embedded-font.js";
 import { resolveFaceWithRegistry } from "./font-registry.js";
 //#region src/measure.ts

package/dist/names.cjs

@@ -3,11 +3,9 @@ const require_objects = require("./objects.cjs");
 const require_pdf_text = require("./pdf-text.cjs");
 //#region src/names.ts
 function walkNameTree(root, resolver, sink) {
-	const entries = [];
-	collectNameTreeEntries(root, resolver, sink, entries, /* @__PURE__ */ new Set());
-	return entries;
+	return collectNameTreeEntries(root, resolver, sink, /* @__PURE__ */ new Set());
 }
-function collectNameTreeEntries(node, resolver, sink, entries, visited) {
+function collectNameTreeEntries(node, resolver, sink, visited) {
 	const dict = require_objects.asDict(resolver.resolve(node));
 	if (dict === void 0) {
 		if (node !== void 0) sink({
@@ -15,7 +13,7 @@ function collectNameTreeEntries(node, resolver, sink, entries, visited) {
 			severity: "warning",
 			message: "a name tree node did not resolve to a dictionary; skipping it"
 		});
-		return;
+		return [];
 	}
 	if (visited.has(dict)) {
 		sink({
@@ -23,9 +21,10 @@ function collectNameTreeEntries(node, resolver, sink, entries, visited) {
 			severity: "warning",
 			message: "the name tree contains a cycle; stopping descent at the repeated node"
 		});
-		return;
+		return [];
 	}
 	visited.add(dict);
+	const entries = [];
 	const names = require_objects.asArray(require_objects.dictGet(dict, "Names"));
 	if (names !== void 0) for (let i = 0; i + 1 < names.length; i += 2) {
 		const key = names[i];
@@ -35,7 +34,8 @@ function collectNameTreeEntries(node, resolver, sink, entries, visited) {
 		});
 	}
 	const kids = require_objects.asArray(require_objects.dictGet(dict, "Kids"));
-	if (kids !== void 0) for (const kid of kids) collectNameTreeEntries(kid, resolver, sink, entries, visited);
+	if (kids !== void 0) for (const kid of kids) for (const entry of collectNameTreeEntries(kid, resolver, sink, visited)) entries.push(entry);
+	return entries;
 }
 //#endregion
 exports.walkNameTree = walkNameTree;

package/dist/names.d.cts

@@ -1,11 +1,11 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
-import { r as PdfObject } from "./objects-B7HdMeWS.cjs";
+import { r as PdfObject } from "./objects-e2RS3-yT.cjs";
 import { PdfObjectResolver } from "./interpret.cjs";
 //#region src/names.d.ts
 interface NameTreeEntry {
   readonly name: string;
   readonly value: PdfObject;
 }
-declare function walkNameTree(root: PdfObject | undefined, resolver: PdfObjectResolver, sink: PdfDiagnosticSink): NameTreeEntry[];
+declare function walkNameTree(root: PdfObject | undefined, resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): NameTreeEntry[];
 //#endregion
 export { NameTreeEntry, walkNameTree };

package/dist/names.d.ts

@@ -1,11 +1,11 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
-import { r as PdfObject } from "./objects-B7HdMeWS.js";
+import { r as PdfObject } from "./objects-e2RS3-yT.js";
 import { PdfObjectResolver } from "./interpret.js";
 //#region src/names.d.ts
 interface NameTreeEntry {
   readonly name: string;
   readonly value: PdfObject;
 }
-declare function walkNameTree(root: PdfObject | undefined, resolver: PdfObjectResolver, sink: PdfDiagnosticSink): NameTreeEntry[];
+declare function walkNameTree(root: PdfObject | undefined, resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): NameTreeEntry[];
 //#endregion
 export { NameTreeEntry, walkNameTree };

package/dist/names.js

@@ -2,11 +2,9 @@ import { asArray, asDict, dictGet } from "./objects.js";
 import { decodePdfString } from "./pdf-text.js";
 //#region src/names.ts
 function walkNameTree(root, resolver, sink) {
-	const entries = [];
-	collectNameTreeEntries(root, resolver, sink, entries, /* @__PURE__ */ new Set());
-	return entries;
+	return collectNameTreeEntries(root, resolver, sink, /* @__PURE__ */ new Set());
 }
-function collectNameTreeEntries(node, resolver, sink, entries, visited) {
+function collectNameTreeEntries(node, resolver, sink, visited) {
 	const dict = asDict(resolver.resolve(node));
 	if (dict === void 0) {
 		if (node !== void 0) sink({
@@ -14,7 +12,7 @@ function collectNameTreeEntries(node, resolver, sink, entries, visited) {
 			severity: "warning",
 			message: "a name tree node did not resolve to a dictionary; skipping it"
 		});
-		return;
+		return [];
 	}
 	if (visited.has(dict)) {
 		sink({
@@ -22,9 +20,10 @@ function collectNameTreeEntries(node, resolver, sink, entries, visited) {
 			severity: "warning",
 			message: "the name tree contains a cycle; stopping descent at the repeated node"
 		});
-		return;
+		return [];
 	}
 	visited.add(dict);
+	const entries = [];
 	const names = asArray(dictGet(dict, "Names"));
 	if (names !== void 0) for (let i = 0; i + 1 < names.length; i += 2) {
 		const key = names[i];
@@ -34,7 +33,8 @@ function collectNameTreeEntries(node, resolver, sink, entries, visited) {
 		});
 	}
 	const kids = asArray(dictGet(dict, "Kids"));
-	if (kids !== void 0) for (const kid of kids) collectNameTreeEntries(kid, resolver, sink, entries, visited);
+	if (kids !== void 0) for (const kid of kids) for (const entry of collectNameTreeEntries(kid, resolver, sink, visited)) entries.push(entry);
+	return entries;
 }
 //#endregion
 export { walkNameTree };

package/dist/navigation.cjs

@@ -6,6 +6,11 @@ const require_names = require("./names.cjs");
 function coordinateAt(arr, index) {
 	return require_objects.asNumber(arr[index]);
 }
+const DEST_XYZ_TOP_INDEX = 3;
+const DEST_XYZ_ZOOM_INDEX = 4;
+const DEST_FITR_BOTTOM_INDEX = 3;
+const DEST_FITR_RIGHT_INDEX = 4;
+const DEST_FITR_TOP_INDEX = 5;
 function parseDestination(value, resolver, pageIndex, sink) {
 	const arr = require_objects.asArray(resolver.resolve(value));
 	if (arr === void 0 || arr.length < 2) {
@@ -33,8 +38,8 @@ function parseDestination(value, resolver, pageIndex, sink) {
 			kind: "xyz",
 			...optionalCoords(arr, [
 				["leftPt", 2],
-				["topPt", 3],
-				["zoom", 4]
+				["topPt", DEST_XYZ_TOP_INDEX],
+				["zoom", DEST_XYZ_ZOOM_INDEX]
 			])
 		}
 	};
@@ -62,9 +67,9 @@ function parseDestination(value, resolver, pageIndex, sink) {
 			kind: "fitR",
 			...optionalCoords(arr, [
 				["leftPt", 2],
-				["bottomPt", 3],
-				["rightPt", 4],
-				["topPt", 5]
+				["bottomPt", DEST_FITR_BOTTOM_INDEX],
+				["rightPt", DEST_FITR_RIGHT_INDEX],
+				["topPt", DEST_FITR_TOP_INDEX]
 			])
 		}
 	};
@@ -161,11 +166,10 @@ function readOutline(catalog, registry, resolver, sink) {
 	const root = resolver.resolveDict(require_objects.dictGet(catalog, "Outlines"));
 	const first = root === void 0 ? void 0 : resolver.resolveDict(require_objects.dictGet(root, "First"));
 	if (first === void 0) return [];
-	const items = [];
-	walkOutlineSiblings(first, items, registry, resolver, sink, /* @__PURE__ */ new Set());
-	return items;
+	return walkOutlineSiblings(first, registry, resolver, sink, /* @__PURE__ */ new Set());
 }
-function walkOutlineSiblings(node, out, registry, resolver, sink, visited) {
+function walkOutlineSiblings(node, registry, resolver, sink, visited) {
+	const out = [];
 	let current = node;
 	while (current !== void 0) {
 		if (visited.has(current)) {
@@ -174,13 +178,12 @@ function walkOutlineSiblings(node, out, registry, resolver, sink, visited) {
 				severity: "warning",
 				message: "the outline contains a cycle; stopping the sibling chain at the repeated item"
 			});
-			return;
+			return out;
 		}
 		visited.add(current);
 		const titleObj = require_objects.dictGet(current, "Title");
-		const children = [];
 		const childFirst = resolver.resolveDict(require_objects.dictGet(current, "First"));
-		if (childFirst !== void 0) walkOutlineSiblings(childFirst, children, registry, resolver, sink, visited);
+		const children = childFirst === void 0 ? [] : walkOutlineSiblings(childFirst, registry, resolver, sink, visited);
 		const destination = internOutlineDestination(current, registry, resolver);
 		out.push({
 			title: titleObj?.kind === "string" ? require_pdf_text.decodePdfString(titleObj.bytes) : "",
@@ -189,6 +192,7 @@ function walkOutlineSiblings(node, out, registry, resolver, sink, visited) {
 		});
 		current = resolver.resolveDict(require_objects.dictGet(current, "Next"));
 	}
+	return out;
 }
 function internOutlineDestination(node, registry, resolver) {
 	const dest = require_objects.dictGet(node, "Dest");

package/dist/navigation.d.cts

@@ -1,10 +1,10 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
-import { n as PdfDict, r as PdfObject } from "./objects-B7HdMeWS.cjs";
+import { n as PdfDict, r as PdfObject } from "./objects-e2RS3-yT.cjs";
 import { PdfObjectResolver } from "./interpret.cjs";
 import { LayoutDestination, LayoutDestinationTarget, LayoutOutlineItem } from "./layout.cjs";
 //#region src/navigation.d.ts
 type PageIndexLookup = (obj: PdfObject | undefined) => number | undefined;
-declare function parseDestination(value: PdfObject | undefined, resolver: PdfObjectResolver, pageIndex: PageIndexLookup, sink: PdfDiagnosticSink): {
+declare function parseDestination(value: PdfObject | undefined, resolver: Readonly<PdfObjectResolver>, pageIndex: PageIndexLookup, sink: PdfDiagnosticSink): {
   pageIndex: number;
   target: LayoutDestinationTarget;
 } | undefined;
@@ -12,7 +12,7 @@ interface DestinationRegistry {
   readonly entries: readonly LayoutDestination[];
   intern: (obj: PdfObject | undefined) => string | undefined;
 }
-declare function createDestinationRegistry(catalog: PdfDict, resolver: PdfObjectResolver, pageIndex: PageIndexLookup, sink: PdfDiagnosticSink): DestinationRegistry;
-declare function readOutline(catalog: PdfDict, registry: DestinationRegistry, resolver: PdfObjectResolver, sink: PdfDiagnosticSink): LayoutOutlineItem[];
+declare function createDestinationRegistry(catalog: PdfDict, resolver: Readonly<PdfObjectResolver>, pageIndex: PageIndexLookup, sink: PdfDiagnosticSink): DestinationRegistry;
+declare function readOutline(catalog: PdfDict, registry: DestinationRegistry, resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): LayoutOutlineItem[];
 //#endregion
 export { DestinationRegistry, PageIndexLookup, createDestinationRegistry, parseDestination, readOutline };

package/dist/navigation.d.ts

@@ -1,10 +1,10 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
-import { n as PdfDict, r as PdfObject } from "./objects-B7HdMeWS.js";
+import { n as PdfDict, r as PdfObject } from "./objects-e2RS3-yT.js";
 import { PdfObjectResolver } from "./interpret.js";
 import { LayoutDestination, LayoutDestinationTarget, LayoutOutlineItem } from "./layout.js";
 //#region src/navigation.d.ts
 type PageIndexLookup = (obj: PdfObject | undefined) => number | undefined;
-declare function parseDestination(value: PdfObject | undefined, resolver: PdfObjectResolver, pageIndex: PageIndexLookup, sink: PdfDiagnosticSink): {
+declare function parseDestination(value: PdfObject | undefined, resolver: Readonly<PdfObjectResolver>, pageIndex: PageIndexLookup, sink: PdfDiagnosticSink): {
   pageIndex: number;
   target: LayoutDestinationTarget;
 } | undefined;
@@ -12,7 +12,7 @@ interface DestinationRegistry {
   readonly entries: readonly LayoutDestination[];
   intern: (obj: PdfObject | undefined) => string | undefined;
 }
-declare function createDestinationRegistry(catalog: PdfDict, resolver: PdfObjectResolver, pageIndex: PageIndexLookup, sink: PdfDiagnosticSink): DestinationRegistry;
-declare function readOutline(catalog: PdfDict, registry: DestinationRegistry, resolver: PdfObjectResolver, sink: PdfDiagnosticSink): LayoutOutlineItem[];
+declare function createDestinationRegistry(catalog: PdfDict, resolver: Readonly<PdfObjectResolver>, pageIndex: PageIndexLookup, sink: PdfDiagnosticSink): DestinationRegistry;
+declare function readOutline(catalog: PdfDict, registry: DestinationRegistry, resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): LayoutOutlineItem[];
 //#endregion
 export { DestinationRegistry, PageIndexLookup, createDestinationRegistry, parseDestination, readOutline };

package/dist/navigation.js

@@ -5,6 +5,11 @@ import { walkNameTree } from "./names.js";
 function coordinateAt(arr, index) {
 	return asNumber(arr[index]);
 }
+const DEST_XYZ_TOP_INDEX = 3;
+const DEST_XYZ_ZOOM_INDEX = 4;
+const DEST_FITR_BOTTOM_INDEX = 3;
+const DEST_FITR_RIGHT_INDEX = 4;
+const DEST_FITR_TOP_INDEX = 5;
 function parseDestination(value, resolver, pageIndex, sink) {
 	const arr = asArray(resolver.resolve(value));
 	if (arr === void 0 || arr.length < 2) {
@@ -32,8 +37,8 @@ function parseDestination(value, resolver, pageIndex, sink) {
 			kind: "xyz",
 			...optionalCoords(arr, [
 				["leftPt", 2],
-				["topPt", 3],
-				["zoom", 4]
+				["topPt", DEST_XYZ_TOP_INDEX],
+				["zoom", DEST_XYZ_ZOOM_INDEX]
 			])
 		}
 	};
@@ -61,9 +66,9 @@ function parseDestination(value, resolver, pageIndex, sink) {
 			kind: "fitR",
 			...optionalCoords(arr, [
 				["leftPt", 2],
-				["bottomPt", 3],
-				["rightPt", 4],
-				["topPt", 5]
+				["bottomPt", DEST_FITR_BOTTOM_INDEX],
+				["rightPt", DEST_FITR_RIGHT_INDEX],
+				["topPt", DEST_FITR_TOP_INDEX]
 			])
 		}
 	};
@@ -160,11 +165,10 @@ function readOutline(catalog, registry, resolver, sink) {
 	const root = resolver.resolveDict(dictGet(catalog, "Outlines"));
 	const first = root === void 0 ? void 0 : resolver.resolveDict(dictGet(root, "First"));
 	if (first === void 0) return [];
-	const items = [];
-	walkOutlineSiblings(first, items, registry, resolver, sink, /* @__PURE__ */ new Set());
-	return items;
+	return walkOutlineSiblings(first, registry, resolver, sink, /* @__PURE__ */ new Set());
 }
-function walkOutlineSiblings(node, out, registry, resolver, sink, visited) {
+function walkOutlineSiblings(node, registry, resolver, sink, visited) {
+	const out = [];
 	let current = node;
 	while (current !== void 0) {
 		if (visited.has(current)) {
@@ -173,13 +177,12 @@ function walkOutlineSiblings(node, out, registry, resolver, sink, visited) {
 				severity: "warning",
 				message: "the outline contains a cycle; stopping the sibling chain at the repeated item"
 			});
-			return;
+			return out;
 		}
 		visited.add(current);
 		const titleObj = dictGet(current, "Title");
-		const children = [];
 		const childFirst = resolver.resolveDict(dictGet(current, "First"));
-		if (childFirst !== void 0) walkOutlineSiblings(childFirst, children, registry, resolver, sink, visited);
+		const children = childFirst === void 0 ? [] : walkOutlineSiblings(childFirst, registry, resolver, sink, visited);
 		const destination = internOutlineDestination(current, registry, resolver);
 		out.push({
 			title: titleObj?.kind === "string" ? decodePdfString(titleObj.bytes) : "",
@@ -188,6 +191,7 @@ function walkOutlineSiblings(node, out, registry, resolver, sink, visited) {
 		});
 		current = resolver.resolveDict(dictGet(current, "Next"));
 	}
+	return out;
 }
 function internOutlineDestination(node, registry, resolver) {
 	const dest = dictGet(node, "Dest");

package/dist/{objects-B7HdMeWS.d.cts → objects-e2RS3-yT.d.cts}

@@ -16,7 +16,7 @@ type PdfObject = {
   hex: boolean;
 } | {
   kind: "array";
-  items: PdfObject[];
+  items: readonly PdfObject[];
 } | {
   kind: "dict";
   entries: Map<string, PdfObject>;
@@ -44,7 +44,7 @@ declare function pdfNum(value: number): PdfObject;
 declare function pdfName(name: string): PdfObject;
 declare function pdfHexString(bytes: Uint8Array<ArrayBuffer>): PdfObject;
 declare function pdfLiteralString(bytes: Uint8Array<ArrayBuffer>): PdfObject;
-declare function pdfArray(items: PdfObject[]): PdfObject;
+declare function pdfArray(items: readonly PdfObject[]): PdfObject;
 declare function pdfDict(entries: Record<string, PdfObject> | Map<string, PdfObject>): PdfDict;
 declare function pdfStream(dict: PdfDict, raw: Uint8Array<ArrayBuffer>): PdfObject;
 declare function pdfRef(num: number, gen: number): PdfObject;
@@ -52,7 +52,7 @@ declare function isName(obj: PdfObject | undefined, name: string): boolean;
 declare function asNumber(obj: PdfObject | undefined): number | undefined;
 declare function asName(obj: PdfObject | undefined): string | undefined;
 declare function asBool(obj: PdfObject | undefined): boolean | undefined;
-declare function asArray(obj: PdfObject | undefined): PdfObject[] | undefined;
+declare function asArray(obj: PdfObject | undefined): readonly PdfObject[] | undefined;
 declare function asDict(obj: PdfObject | undefined): PdfDict | undefined;
 declare function dictGet(dict: PdfDict, key: string): PdfObject | undefined;
 //#endregion

package/dist/{objects-B7HdMeWS.d.ts → objects-e2RS3-yT.d.ts}

@@ -16,7 +16,7 @@ type PdfObject = {
   hex: boolean;
 } | {
   kind: "array";
-  items: PdfObject[];
+  items: readonly PdfObject[];
 } | {
   kind: "dict";
   entries: Map<string, PdfObject>;
@@ -44,7 +44,7 @@ declare function pdfNum(value: number): PdfObject;
 declare function pdfName(name: string): PdfObject;
 declare function pdfHexString(bytes: Uint8Array<ArrayBuffer>): PdfObject;
 declare function pdfLiteralString(bytes: Uint8Array<ArrayBuffer>): PdfObject;
-declare function pdfArray(items: PdfObject[]): PdfObject;
+declare function pdfArray(items: readonly PdfObject[]): PdfObject;
 declare function pdfDict(entries: Record<string, PdfObject> | Map<string, PdfObject>): PdfDict;
 declare function pdfStream(dict: PdfDict, raw: Uint8Array<ArrayBuffer>): PdfObject;
 declare function pdfRef(num: number, gen: number): PdfObject;
@@ -52,7 +52,7 @@ declare function isName(obj: PdfObject | undefined, name: string): boolean;
 declare function asNumber(obj: PdfObject | undefined): number | undefined;
 declare function asName(obj: PdfObject | undefined): string | undefined;
 declare function asBool(obj: PdfObject | undefined): boolean | undefined;
-declare function asArray(obj: PdfObject | undefined): PdfObject[] | undefined;
+declare function asArray(obj: PdfObject | undefined): readonly PdfObject[] | undefined;
 declare function asDict(obj: PdfObject | undefined): PdfDict | undefined;
 declare function dictGet(dict: PdfDict, key: string): PdfObject | undefined;
 //#endregion

package/dist/objects.d.cts

@@ -1,2 +1,2 @@
-import { _ as pdfName, a as asArray, b as pdfRef, c as asName, d as isName, f as pdfArray, g as pdfLiteralString, h as pdfHexString, i as PdfStream, l as asNumber, m as pdfDict, n as PdfDict, o as asBool, p as pdfBool, r as PdfObject, s as asDict, t as PdfArray, u as dictGet, v as pdfNull, x as pdfStream, y as pdfNum } from "./objects-B7HdMeWS.cjs";
+import { _ as pdfName, a as asArray, b as pdfRef, c as asName, d as isName, f as pdfArray, g as pdfLiteralString, h as pdfHexString, i as PdfStream, l as asNumber, m as pdfDict, n as PdfDict, o as asBool, p as pdfBool, r as PdfObject, s as asDict, t as PdfArray, u as dictGet, v as pdfNull, x as pdfStream, y as pdfNum } from "./objects-e2RS3-yT.cjs";
 export { PdfArray, PdfDict, PdfObject, PdfStream, asArray, asBool, asDict, asName, asNumber, dictGet, isName, pdfArray, pdfBool, pdfDict, pdfHexString, pdfLiteralString, pdfName, pdfNull, pdfNum, pdfRef, pdfStream };

package/dist/objects.d.ts

@@ -1,2 +1,2 @@
-import { _ as pdfName, a as asArray, b as pdfRef, c as asName, d as isName, f as pdfArray, g as pdfLiteralString, h as pdfHexString, i as PdfStream, l as asNumber, m as pdfDict, n as PdfDict, o as asBool, p as pdfBool, r as PdfObject, s as asDict, t as PdfArray, u as dictGet, v as pdfNull, x as pdfStream, y as pdfNum } from "./objects-B7HdMeWS.js";
+import { _ as pdfName, a as asArray, b as pdfRef, c as asName, d as isName, f as pdfArray, g as pdfLiteralString, h as pdfHexString, i as PdfStream, l as asNumber, m as pdfDict, n as PdfDict, o as asBool, p as pdfBool, r as PdfObject, s as asDict, t as PdfArray, u as dictGet, v as pdfNull, x as pdfStream, y as pdfNum } from "./objects-e2RS3-yT.js";
 export { PdfArray, PdfDict, PdfObject, PdfStream, asArray, asBool, asDict, asName, asNumber, dictGet, isName, pdfArray, pdfBool, pdfDict, pdfHexString, pdfLiteralString, pdfName, pdfNull, pdfNum, pdfRef, pdfStream };

package/dist/optional-content.d.cts

@@ -1,5 +1,5 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
-import { n as PdfDict, r as PdfObject } from "./objects-B7HdMeWS.cjs";
+import { n as PdfDict, r as PdfObject } from "./objects-e2RS3-yT.cjs";
 import { PdfObjectResolver } from "./interpret.cjs";
 import { LayoutLayer } from "./layout.cjs";
 //#region src/optional-content.d.ts
@@ -7,6 +7,6 @@ interface OptionalContentContext {
   readonly layers: readonly LayoutLayer[];
   readonly layerNameOf: (obj: PdfObject | undefined) => string | undefined;
 }
-declare function readOptionalContent(catalog: PdfDict, resolver: PdfObjectResolver, sink: PdfDiagnosticSink): OptionalContentContext;
+declare function readOptionalContent(catalog: PdfDict, resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): OptionalContentContext;
 //#endregion
 export { OptionalContentContext, readOptionalContent };

package/dist/optional-content.d.ts

@@ -1,5 +1,5 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
-import { n as PdfDict, r as PdfObject } from "./objects-B7HdMeWS.js";
+import { n as PdfDict, r as PdfObject } from "./objects-e2RS3-yT.js";
 import { PdfObjectResolver } from "./interpret.js";
 import { LayoutLayer } from "./layout.js";
 //#region src/optional-content.d.ts
@@ -7,6 +7,6 @@ interface OptionalContentContext {
   readonly layers: readonly LayoutLayer[];
   readonly layerNameOf: (obj: PdfObject | undefined) => string | undefined;
 }
-declare function readOptionalContent(catalog: PdfDict, resolver: PdfObjectResolver, sink: PdfDiagnosticSink): OptionalContentContext;
+declare function readOptionalContent(catalog: PdfDict, resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): OptionalContentContext;
 //#endregion
 export { OptionalContentContext, readOptionalContent };

package/dist/ot-layout-common.cjs

@@ -12,23 +12,21 @@ function findRange(ranges, glyphId) {
 		else return range;
 	}
 }
-function pushGlyph(ranges, glyphId, value, valueStep) {
+function placeGlyph(ranges, glyphId, value, valueStep) {
 	const previous = ranges[ranges.length - 1];
-	if (previous !== void 0 && glyphId === previous.endGlyphId + 1 && value === previous.value + (previous.endGlyphId - previous.startGlyphId + 1) * valueStep) {
-		ranges[ranges.length - 1] = {
-			startGlyphId: previous.startGlyphId,
-			endGlyphId: glyphId,
-			value: previous.value
-		};
-		return;
-	}
-	ranges.push({
+	if (previous !== void 0 && glyphId === previous.endGlyphId + 1 && value === previous.value + (previous.endGlyphId - previous.startGlyphId + 1) * valueStep) return { extended: {
+		startGlyphId: previous.startGlyphId,
+		endGlyphId: glyphId,
+		value: previous.value
+	} };
+	return { fresh: {
 		startGlyphId: glyphId,
 		endGlyphId: glyphId,
 		value
-	});
+	} };
 }
 const RANGE_RECORD_SIZE = 6;
+const RANGE_RECORD_VALUE_OFFSET = 4;
 function parseRangeRecords(bytes, recordsOffset, recordCount) {
 	if (!require_sfnt.hasBytes(bytes, recordsOffset, recordCount * RANGE_RECORD_SIZE)) return;
 	const ranges = [];
@@ -40,7 +38,7 @@ function parseRangeRecords(bytes, recordsOffset, recordCount) {
 		ranges.push({
 			startGlyphId,
 			endGlyphId,
-			value: require_sfnt.u16(bytes, recordOffset + 4)
+			value: require_sfnt.u16(bytes, recordOffset + RANGE_RECORD_VALUE_OFFSET)
 		});
 	}
 	ranges.sort((a, b) => a.startGlyphId - b.startGlyphId);
@@ -56,7 +54,11 @@ function parseCoverage(bytes, coverageOffset) {
 		const glyphArrayOffset = coverageOffset + COVERAGE_HEADER_SIZE;
 		if (!require_sfnt.hasBytes(bytes, glyphArrayOffset, count * 2)) return;
 		ranges = [];
-		for (let i = 0; i < count; i++) pushGlyph(ranges, require_sfnt.u16(bytes, glyphArrayOffset + i * 2), i, 1);
+		for (let i = 0; i < count; i++) {
+			const placement = placeGlyph(ranges, require_sfnt.u16(bytes, glyphArrayOffset + i * 2), i, 1);
+			if (placement.extended !== void 0) ranges[ranges.length - 1] = placement.extended;
+			else ranges.push(placement.fresh);
+		}
 		ranges.sort((a, b) => a.startGlyphId - b.startGlyphId);
 	} else if (format === 2) ranges = parseRangeRecords(bytes, coverageOffset + COVERAGE_HEADER_SIZE, count);
 	if (ranges === void 0) return;
@@ -72,6 +74,7 @@ function parseCoverage(bytes, coverageOffset) {
 	};
 }
 const CLASS_DEF_FORMAT_1_HEADER_SIZE = 6;
+const CLASS_DEF_FORMAT_1_GLYPH_COUNT_OFFSET = 4;
 const CLASS_DEF_FORMAT_2_HEADER_SIZE = 4;
 function parseClassDef(bytes, classDefOffset) {
 	if (!require_sfnt.hasBytes(bytes, classDefOffset, CLASS_DEF_FORMAT_2_HEADER_SIZE)) return;
@@ -80,11 +83,15 @@ function parseClassDef(bytes, classDefOffset) {
 	if (format === 1) {
 		if (!require_sfnt.hasBytes(bytes, classDefOffset, CLASS_DEF_FORMAT_1_HEADER_SIZE)) return;
 		const startGlyphId = require_sfnt.u16(bytes, classDefOffset + 2);
-		const glyphCount = require_sfnt.u16(bytes, classDefOffset + 4);
+		const glyphCount = require_sfnt.u16(bytes, classDefOffset + CLASS_DEF_FORMAT_1_GLYPH_COUNT_OFFSET);
 		const classArrayOffset = classDefOffset + CLASS_DEF_FORMAT_1_HEADER_SIZE;
 		if (!require_sfnt.hasBytes(bytes, classArrayOffset, glyphCount * 2)) return;
 		ranges = [];
-		for (let i = 0; i < glyphCount; i++) pushGlyph(ranges, startGlyphId + i, require_sfnt.u16(bytes, classArrayOffset + i * 2), 0);
+		for (let i = 0; i < glyphCount; i++) {
+			const placement = placeGlyph(ranges, startGlyphId + i, require_sfnt.u16(bytes, classArrayOffset + i * 2), 0);
+			if (placement.extended !== void 0) ranges[ranges.length - 1] = placement.extended;
+			else ranges.push(placement.fresh);
+		}
 	} else if (format === 2) ranges = parseRangeRecords(bytes, classDefOffset + CLASS_DEF_FORMAT_2_HEADER_SIZE, require_sfnt.u16(bytes, classDefOffset + 2));
 	if (ranges === void 0) return;
 	const resolved = ranges;

package/dist/ot-layout-common.js

@@ -11,23 +11,21 @@ function findRange(ranges, glyphId) {
 		else return range;
 	}
 }
-function pushGlyph(ranges, glyphId, value, valueStep) {
+function placeGlyph(ranges, glyphId, value, valueStep) {
 	const previous = ranges[ranges.length - 1];
-	if (previous !== void 0 && glyphId === previous.endGlyphId + 1 && value === previous.value + (previous.endGlyphId - previous.startGlyphId + 1) * valueStep) {
-		ranges[ranges.length - 1] = {
-			startGlyphId: previous.startGlyphId,
-			endGlyphId: glyphId,
-			value: previous.value
-		};
-		return;
-	}
-	ranges.push({
+	if (previous !== void 0 && glyphId === previous.endGlyphId + 1 && value === previous.value + (previous.endGlyphId - previous.startGlyphId + 1) * valueStep) return { extended: {
+		startGlyphId: previous.startGlyphId,
+		endGlyphId: glyphId,
+		value: previous.value
+	} };
+	return { fresh: {
 		startGlyphId: glyphId,
 		endGlyphId: glyphId,
 		value
-	});
+	} };
 }
 const RANGE_RECORD_SIZE = 6;
+const RANGE_RECORD_VALUE_OFFSET = 4;
 function parseRangeRecords(bytes, recordsOffset, recordCount) {
 	if (!hasBytes(bytes, recordsOffset, recordCount * RANGE_RECORD_SIZE)) return;
 	const ranges = [];
@@ -39,7 +37,7 @@ function parseRangeRecords(bytes, recordsOffset, recordCount) {
 		ranges.push({
 			startGlyphId,
 			endGlyphId,
-			value: u16(bytes, recordOffset + 4)
+			value: u16(bytes, recordOffset + RANGE_RECORD_VALUE_OFFSET)
 		});
 	}
 	ranges.sort((a, b) => a.startGlyphId - b.startGlyphId);
@@ -55,7 +53,11 @@ function parseCoverage(bytes, coverageOffset) {
 		const glyphArrayOffset = coverageOffset + COVERAGE_HEADER_SIZE;
 		if (!hasBytes(bytes, glyphArrayOffset, count * 2)) return;
 		ranges = [];
-		for (let i = 0; i < count; i++) pushGlyph(ranges, u16(bytes, glyphArrayOffset + i * 2), i, 1);
+		for (let i = 0; i < count; i++) {
+			const placement = placeGlyph(ranges, u16(bytes, glyphArrayOffset + i * 2), i, 1);
+			if (placement.extended !== void 0) ranges[ranges.length - 1] = placement.extended;
+			else ranges.push(placement.fresh);
+		}
 		ranges.sort((a, b) => a.startGlyphId - b.startGlyphId);
 	} else if (format === 2) ranges = parseRangeRecords(bytes, coverageOffset + COVERAGE_HEADER_SIZE, count);
 	if (ranges === void 0) return;
@@ -71,6 +73,7 @@ function parseCoverage(bytes, coverageOffset) {
 	};
 }
 const CLASS_DEF_FORMAT_1_HEADER_SIZE = 6;
+const CLASS_DEF_FORMAT_1_GLYPH_COUNT_OFFSET = 4;
 const CLASS_DEF_FORMAT_2_HEADER_SIZE = 4;
 function parseClassDef(bytes, classDefOffset) {
 	if (!hasBytes(bytes, classDefOffset, CLASS_DEF_FORMAT_2_HEADER_SIZE)) return;
@@ -79,11 +82,15 @@ function parseClassDef(bytes, classDefOffset) {
 	if (format === 1) {
 		if (!hasBytes(bytes, classDefOffset, CLASS_DEF_FORMAT_1_HEADER_SIZE)) return;
 		const startGlyphId = u16(bytes, classDefOffset + 2);
-		const glyphCount = u16(bytes, classDefOffset + 4);
+		const glyphCount = u16(bytes, classDefOffset + CLASS_DEF_FORMAT_1_GLYPH_COUNT_OFFSET);
 		const classArrayOffset = classDefOffset + CLASS_DEF_FORMAT_1_HEADER_SIZE;
 		if (!hasBytes(bytes, classArrayOffset, glyphCount * 2)) return;
 		ranges = [];
-		for (let i = 0; i < glyphCount; i++) pushGlyph(ranges, startGlyphId + i, u16(bytes, classArrayOffset + i * 2), 0);
+		for (let i = 0; i < glyphCount; i++) {
+			const placement = placeGlyph(ranges, startGlyphId + i, u16(bytes, classArrayOffset + i * 2), 0);
+			if (placement.extended !== void 0) ranges[ranges.length - 1] = placement.extended;
+			else ranges.push(placement.fresh);
+		}
 	} else if (format === 2) ranges = parseRangeRecords(bytes, classDefOffset + CLASS_DEF_FORMAT_2_HEADER_SIZE, u16(bytes, classDefOffset + 2));
 	if (ranges === void 0) return;
 	const resolved = ranges;

package/dist/parse.cjs

@@ -110,10 +110,12 @@ function parseDictOrStreamBody(reader, sink) {
 	reader.reset(afterDictMark);
 	return dict;
 }
+const CARRIAGE_RETURN = 13;
+const LINE_FEED = 10;
 function skipStreamDataStart(reader, sink) {
-	if (reader.peek() === 13) {
+	if (reader.peek() === CARRIAGE_RETURN) {
 		reader.next();
-		if (reader.peek() === 10) reader.next();
+		if (reader.peek() === LINE_FEED) reader.next();
 		else sink({
 			code: "pdf/stream-bad-eol",
 			severity: "warning",
@@ -121,7 +123,7 @@ function skipStreamDataStart(reader, sink) {
 		});
 		return;
 	}
-	if (reader.peek() === 10) {
+	if (reader.peek() === LINE_FEED) {
 		reader.next();
 		return;
 	}
@@ -187,8 +189,8 @@ function findEndstreamOffset(reader, fromOffset) {
 }
 function trimTrailingStreamEol(reader, dataStart, endstreamOffset) {
 	const precedingTwo = reader.slice(Math.max(dataStart, endstreamOffset - 2), endstreamOffset);
-	if (precedingTwo.length >= 2 && precedingTwo[precedingTwo.length - 2] === 13 && precedingTwo[precedingTwo.length - 1] === 10) return endstreamOffset - 2;
-	if (precedingTwo.length >= 1 && (precedingTwo[precedingTwo.length - 1] === 10 || precedingTwo[precedingTwo.length - 1] === 13)) return endstreamOffset - 1;
+	if (precedingTwo.length >= 2 && precedingTwo[precedingTwo.length - 2] === CARRIAGE_RETURN && precedingTwo[precedingTwo.length - 1] === LINE_FEED) return endstreamOffset - 2;
+	if (precedingTwo.length >= 1 && (precedingTwo[precedingTwo.length - 1] === LINE_FEED || precedingTwo[precedingTwo.length - 1] === CARRIAGE_RETURN)) return endstreamOffset - 1;
 	return endstreamOffset;
 }
 function parseIndirectObject(reader, sink) {