pdf-parser.js 5.2.26 → 5.2.27

package/dist/interpret.cjs

@@ -274,17 +274,33 @@ function classifyShape(subpaths, paint, style) {
 	if (subpaths.length !== 1 || subpath === void 0) return;
 	return detectRect(subpath, paint) ?? detectEllipse(subpath, paint) ?? detectLine(subpath, paint, style);
 }
+var MarkedContentStack = class {
+	#frames;
+	constructor(seed = []) {
+		this.#frames = [...seed];
+	}
+	open(frame) {
+		this.#frames.push(frame);
+	}
+	close() {
+		this.#frames.pop();
+	}
+	inScope(key) {
+		for (let i = this.#frames.length - 1; i >= 0; i--) {
+			const frame = this.#frames[i];
+			if (frame !== void 0 && key in frame) return frame[key];
+		}
+	}
+};
 function interpretContentStream(bytes, resources, context) {
-	const items = [];
-	runContentStream(bytes, resources, {
+	return runContentStream(bytes, resources, {
 		ctm: require_matrix.IDENTITY_MATRIX,
 		fillColor: document_schema_js.COLOR_BLACK,
 		strokeColor: document_schema_js.COLOR_BLACK,
 		lineWidth: DEFAULT_LINE_WIDTH_PT,
 		dashArray: [],
 		...initialTextParameters()
-	}, context, items, 0, []);
-	return items;
+	}, context, 0, new MarkedContentStack());
 }
 function lastPointOf(subpath) {
 	const last = subpath.segments[subpath.segments.length - 1];
@@ -296,19 +312,15 @@ function lastPointOf(subpath) {
 		y: last.yPt
 	};
 }
-function runContentStream(bytes, resources, initialState, context, items, depth, markedContent) {
+function runContentStream(bytes, resources, initialState, context, depth, markedContent) {
+	const items = [];
 	const operations = require_content_read.readContentStream(bytes, context.sink);
 	const gsStack = [];
 	let gs = initialState;
 	let text = defaultTextObjectState();
 	let pathSubpaths = [];
 	let currentSubpath;
-	const inScope = (key) => {
-		for (let i = markedContent.length - 1; i >= 0; i--) {
-			const frame = markedContent[i];
-			if (frame !== void 0 && key in frame) return frame[key];
-		}
-	};
+	const inScope = (key) => markedContent.inScope(key);
 	const pushItem = (item) => {
 		if (item.kind === "text") {
 			const layer = item.layerName ?? inScope("layerName");
@@ -541,10 +553,10 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 			};
 			const formLayer = ownLayer ?? inScope("layerName");
 			const formMcid = require_objects.dictGet(xobj.dict, "StructParents") !== void 0 ? void 0 : inScope("mcid");
-			runContentStream(decoded.bytes, formResources, formState, context, items, depth + 1, [{
+			for (const formItem of runContentStream(decoded.bytes, formResources, formState, context, depth + 1, new MarkedContentStack([{
 				...formLayer !== void 0 ? { layerName: formLayer } : {},
 				...formMcid !== void 0 ? { mcid: formMcid } : {}
-			}]);
+			}]))) items.push(formItem);
 		}
 	};
 	for (const token of operations) {
@@ -843,18 +855,19 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 					...layerName !== void 0 ? { layerName } : {},
 					...markedContentScopeProps(props)
 				};
-				markedContent.push(depth === 0 ? scopeProps : {
+				markedContent.open(depth === 0 ? scopeProps : {
 					...scopeProps,
 					mcid: void 0
 				});
 				break;
 			}
 			case "BMC":
-				markedContent.push({});
+				markedContent.open({});
 				break;
-			case "EMC": markedContent.pop();
+			case "EMC": markedContent.close();
 		}
 	}
+	return items;
 }
 //#endregion
 exports.interpretContentStream = interpretContentStream;

package/dist/interpret.d.cts

@@ -1,6 +1,6 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
 import { r as Matrix } from "./matrix-B7_SBKQ5.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 { Color, ContentStrokeStyle } from "document-schema.js";
 //#region src/interpret.d.ts
 interface ExtractedTextRun {

package/dist/interpret.d.ts

@@ -1,6 +1,6 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
 import { r as Matrix } from "./matrix-B7_SBKQ5.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 { Color, ContentStrokeStyle } from "document-schema.js";
 //#region src/interpret.d.ts
 interface ExtractedTextRun {

package/dist/interpret.js

@@ -273,17 +273,33 @@ function classifyShape(subpaths, paint, style) {
 	if (subpaths.length !== 1 || subpath === void 0) return;
 	return detectRect(subpath, paint) ?? detectEllipse(subpath, paint) ?? detectLine(subpath, paint, style);
 }
+var MarkedContentStack = class {
+	#frames;
+	constructor(seed = []) {
+		this.#frames = [...seed];
+	}
+	open(frame) {
+		this.#frames.push(frame);
+	}
+	close() {
+		this.#frames.pop();
+	}
+	inScope(key) {
+		for (let i = this.#frames.length - 1; i >= 0; i--) {
+			const frame = this.#frames[i];
+			if (frame !== void 0 && key in frame) return frame[key];
+		}
+	}
+};
 function interpretContentStream(bytes, resources, context) {
-	const items = [];
-	runContentStream(bytes, resources, {
+	return runContentStream(bytes, resources, {
 		ctm: IDENTITY_MATRIX,
 		fillColor: COLOR_BLACK,
 		strokeColor: COLOR_BLACK,
 		lineWidth: DEFAULT_LINE_WIDTH_PT,
 		dashArray: [],
 		...initialTextParameters()
-	}, context, items, 0, []);
-	return items;
+	}, context, 0, new MarkedContentStack());
 }
 function lastPointOf(subpath) {
 	const last = subpath.segments[subpath.segments.length - 1];
@@ -295,19 +311,15 @@ function lastPointOf(subpath) {
 		y: last.yPt
 	};
 }
-function runContentStream(bytes, resources, initialState, context, items, depth, markedContent) {
+function runContentStream(bytes, resources, initialState, context, depth, markedContent) {
+	const items = [];
 	const operations = readContentStream(bytes, context.sink);
 	const gsStack = [];
 	let gs = initialState;
 	let text = defaultTextObjectState();
 	let pathSubpaths = [];
 	let currentSubpath;
-	const inScope = (key) => {
-		for (let i = markedContent.length - 1; i >= 0; i--) {
-			const frame = markedContent[i];
-			if (frame !== void 0 && key in frame) return frame[key];
-		}
-	};
+	const inScope = (key) => markedContent.inScope(key);
 	const pushItem = (item) => {
 		if (item.kind === "text") {
 			const layer = item.layerName ?? inScope("layerName");
@@ -540,10 +552,10 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 			};
 			const formLayer = ownLayer ?? inScope("layerName");
 			const formMcid = dictGet(xobj.dict, "StructParents") !== void 0 ? void 0 : inScope("mcid");
-			runContentStream(decoded.bytes, formResources, formState, context, items, depth + 1, [{
+			for (const formItem of runContentStream(decoded.bytes, formResources, formState, context, depth + 1, new MarkedContentStack([{
 				...formLayer !== void 0 ? { layerName: formLayer } : {},
 				...formMcid !== void 0 ? { mcid: formMcid } : {}
-			}]);
+			}]))) items.push(formItem);
 		}
 	};
 	for (const token of operations) {
@@ -842,18 +854,19 @@ function runContentStream(bytes, resources, initialState, context, items, depth,
 					...layerName !== void 0 ? { layerName } : {},
 					...markedContentScopeProps(props)
 				};
-				markedContent.push(depth === 0 ? scopeProps : {
+				markedContent.open(depth === 0 ? scopeProps : {
 					...scopeProps,
 					mcid: void 0
 				});
 				break;
 			}
 			case "BMC":
-				markedContent.push({});
+				markedContent.open({});
 				break;
-			case "EMC": markedContent.pop();
+			case "EMC": markedContent.close();
 		}
 	}
+	return items;
 }
 //#endregion
 export { interpretContentStream };

package/dist/math-font-write.d.cts

@@ -1,4 +1,4 @@
-import { n as PdfDict, r as PdfObject } from "./objects-B7HdMeWS.cjs";
+import { n as PdfDict, r as PdfObject } from "./objects-e2RS3-yT.cjs";
 import { MathFont } from "./math-font.cjs";
 //#region src/math-font-write.d.ts
 interface MathFontObjectRefs {

package/dist/math-font-write.d.ts

@@ -1,4 +1,4 @@
-import { n as PdfDict, r as PdfObject } from "./objects-B7HdMeWS.js";
+import { n as PdfDict, r as PdfObject } from "./objects-e2RS3-yT.js";
 import { MathFont } from "./math-font.js";
 //#region src/math-font-write.d.ts
 interface MathFontObjectRefs {

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

@@ -161,11 +161,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 +173,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 +187,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

@@ -160,11 +160,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 +172,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 +186,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,21 +12,18 @@ 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;
 function parseRangeRecords(bytes, recordsOffset, recordCount) {
@@ -56,7 +53,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;
@@ -84,7 +85,11 @@ function parseClassDef(bytes, classDefOffset) {
 		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;