pdf-parser.js 5.2.26 → 5.2.27

package/dist/filters.cjs

@@ -211,21 +211,21 @@ function lzwDecode(data, earlyChange, sink) {
 	}
 	return Uint8Array.from(out);
 }
+const ASCII85_GROUP_BYTES = 4;
 const ASCII85_ZERO_GROUP_MARKER = 122;
 const ASCII85_END_MARKER = 126;
 const ASCII85_MIN_DIGIT = 33;
 const ASCII85_MAX_DIGIT = 117;
 const ASCII85_MAX_DIGIT_VALUE = 84;
-function pushAscii85Group(out, digits, byteCount) {
+function ascii85GroupBytes(digits, byteCount) {
 	let value = 0;
 	for (const digit of digits) value = value * 85 + digit;
-	const bytes = [
+	return [
 		value >>> 24 & 255,
 		value >>> 16 & 255,
 		value >>> 8 & 255,
 		value & 255
-	];
-	for (let i = 0; i < byteCount; i++) out.push(bytes[i]);
+	].slice(0, byteCount);
 }
 function ascii85Decode(data) {
 	const out = [];
@@ -243,14 +243,14 @@ function ascii85Decode(data) {
 		if (byte < ASCII85_MIN_DIGIT || byte > ASCII85_MAX_DIGIT) continue;
 		tuple.push(byte - ASCII85_MIN_DIGIT);
 		if (tuple.length === 5) {
-			pushAscii85Group(out, tuple, 4);
+			out.push(...ascii85GroupBytes(tuple, ASCII85_GROUP_BYTES));
 			tuple = [];
 		}
 	}
 	if (tuple.length > 1) {
 		const padded = tuple.slice();
 		while (padded.length < 5) padded.push(ASCII85_MAX_DIGIT_VALUE);
-		pushAscii85Group(out, padded, tuple.length - 1);
+		out.push(...ascii85GroupBytes(padded, tuple.length - 1));
 	}
 	return Uint8Array.from(out);
 }

package/dist/filters.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";
 //#region src/filters.d.ts
 interface DecodedStream {
   readonly bytes: Uint8Array<ArrayBuffer>;

package/dist/filters.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";
 //#region src/filters.d.ts
 interface DecodedStream {
   readonly bytes: Uint8Array<ArrayBuffer>;

package/dist/filters.js

@@ -210,21 +210,21 @@ function lzwDecode(data, earlyChange, sink) {
 	}
 	return Uint8Array.from(out);
 }
+const ASCII85_GROUP_BYTES = 4;
 const ASCII85_ZERO_GROUP_MARKER = 122;
 const ASCII85_END_MARKER = 126;
 const ASCII85_MIN_DIGIT = 33;
 const ASCII85_MAX_DIGIT = 117;
 const ASCII85_MAX_DIGIT_VALUE = 84;
-function pushAscii85Group(out, digits, byteCount) {
+function ascii85GroupBytes(digits, byteCount) {
 	let value = 0;
 	for (const digit of digits) value = value * 85 + digit;
-	const bytes = [
+	return [
 		value >>> 24 & 255,
 		value >>> 16 & 255,
 		value >>> 8 & 255,
 		value & 255
-	];
-	for (let i = 0; i < byteCount; i++) out.push(bytes[i]);
+	].slice(0, byteCount);
 }
 function ascii85Decode(data) {
 	const out = [];
@@ -242,14 +242,14 @@ function ascii85Decode(data) {
 		if (byte < ASCII85_MIN_DIGIT || byte > ASCII85_MAX_DIGIT) continue;
 		tuple.push(byte - ASCII85_MIN_DIGIT);
 		if (tuple.length === 5) {
-			pushAscii85Group(out, tuple, 4);
+			out.push(...ascii85GroupBytes(tuple, ASCII85_GROUP_BYTES));
 			tuple = [];
 		}
 	}
 	if (tuple.length > 1) {
 		const padded = tuple.slice();
 		while (padded.length < 5) padded.push(ASCII85_MAX_DIGIT_VALUE);
-		pushAscii85Group(out, padded, tuple.length - 1);
+		out.push(...ascii85GroupBytes(padded, tuple.length - 1));
 	}
 	return Uint8Array.from(out);
 }

package/dist/font-read.d.cts

@@ -1,5 +1,5 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
-import { n as PdfDict } from "./objects-B7HdMeWS.cjs";
+import { n as PdfDict } from "./objects-e2RS3-yT.cjs";
 import { FontMetricsPort, PdfObjectResolver } from "./interpret.cjs";
 //#region src/font-read.d.ts
 interface VerticalGlyphMetrics {

package/dist/font-read.d.ts

@@ -1,5 +1,5 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
-import { n as PdfDict } from "./objects-B7HdMeWS.js";
+import { n as PdfDict } from "./objects-e2RS3-yT.js";
 import { FontMetricsPort, PdfObjectResolver } from "./interpret.js";
 //#region src/font-read.d.ts
 interface VerticalGlyphMetrics {

package/dist/font-registry.d.cts

@@ -1,5 +1,5 @@
 import { r as StandardFontName } from "./afm-widths-CneRyu5l.cjs";
-import { t as EmbeddedFace } from "./embedded-font-CEf-zBCA.cjs";
+import { t as EmbeddedFace } from "./embedded-font-DgVBedw6.cjs";
 import { FontRegistryOptions, LayoutFont } from "document-schema.js";
 //#region src/font-registry.d.ts
 type ResolvedFace = {
@@ -11,9 +11,9 @@ type ResolvedFace = {
   readonly matched: boolean;
 };
 interface FontRegistry {
-  resolve: (font: LayoutFont) => ResolvedFace;
+  resolve: (font: Readonly<LayoutFont>) => ResolvedFace;
 }
 declare function createFontRegistry(options?: FontRegistryOptions): FontRegistry;
-declare function resolveFaceWithRegistry(registry: FontRegistry | undefined, font: LayoutFont): ResolvedFace;
+declare function resolveFaceWithRegistry(registry: FontRegistry | undefined, font: Readonly<LayoutFont>): ResolvedFace;
 //#endregion
 export { FontRegistry, ResolvedFace, createFontRegistry, resolveFaceWithRegistry };

package/dist/font-registry.d.ts

@@ -1,5 +1,5 @@
 import { r as StandardFontName } from "./afm-widths-CneRyu5l.js";
-import { t as EmbeddedFace } from "./embedded-font-Bnhh4juV.js";
+import { t as EmbeddedFace } from "./embedded-font-ByD7ZiQS.js";
 import { FontRegistryOptions, LayoutFont } from "document-schema.js";
 //#region src/font-registry.d.ts
 type ResolvedFace = {
@@ -11,9 +11,9 @@ type ResolvedFace = {
   readonly matched: boolean;
 };
 interface FontRegistry {
-  resolve: (font: LayoutFont) => ResolvedFace;
+  resolve: (font: Readonly<LayoutFont>) => ResolvedFace;
 }
 declare function createFontRegistry(options?: FontRegistryOptions): FontRegistry;
-declare function resolveFaceWithRegistry(registry: FontRegistry | undefined, font: LayoutFont): ResolvedFace;
+declare function resolveFaceWithRegistry(registry: FontRegistry | undefined, font: Readonly<LayoutFont>): ResolvedFace;
 //#endregion
 export { FontRegistry, ResolvedFace, createFontRegistry, resolveFaceWithRegistry };

package/dist/form.cjs

@@ -13,11 +13,14 @@ function readAcroForm(catalog, resolver, pageIndex, sink) {
 	const visited = /* @__PURE__ */ new Set();
 	for (const fieldRef of require_objects.asArray(resolver.resolve(require_objects.dictGet(acroForm, "Fields"))) ?? []) {
 		const fieldDict = resolver.resolveDict(fieldRef);
-		if (fieldDict !== void 0) readField(fieldDict, "", resolver, pageIndex, sink, fields, visited);
+		if (fieldDict !== void 0) {
+			const field = readField(fieldDict, "", resolver, pageIndex, sink, visited);
+			if (field !== void 0) fields.push(field);
+		}
 	}
 	return fields;
 }
-function readField(node, parentName, resolver, pageIndex, sink, out, visited) {
+function readField(node, parentName, resolver, pageIndex, sink, visited) {
 	if (visited.has(node)) {
 		sink({
 			code: "pdf/form-field-cycle",
@@ -35,15 +38,17 @@ function readField(node, parentName, resolver, pageIndex, sink, out, visited) {
 		const children = [];
 		for (const kidRef of require_objects.asArray(resolver.resolve(require_objects.dictGet(node, "Kids"))) ?? []) {
 			const kid = resolver.resolveDict(kidRef);
-			if (kid !== void 0) readField(kid, name, resolver, pageIndex, sink, children, visited);
+			if (kid !== void 0) {
+				const child = readField(kid, name, resolver, pageIndex, sink, visited);
+				if (child !== void 0) children.push(child);
+			}
 		}
-		out.push({
+		return {
 			name,
 			fieldType: "group",
 			widgets: [],
 			children
-		});
-		return;
+		};
 	}
 	const flags = require_objects.asNumber(resolver.resolve(require_objects.dictGet(node, "Ff"))) ?? 0;
 	const value = fieldValue(node, resolver);
@@ -60,7 +65,7 @@ function readField(node, parentName, resolver, pageIndex, sink, out, visited) {
 		const widget = widgetPlacement(node, pageIndex);
 		if (widget !== void 0) widgets.push(widget);
 	}
-	out.push({
+	return {
 		name,
 		fieldType: mapFieldType(fieldType, flags),
 		...valueFields(fieldType, value),
@@ -69,7 +74,7 @@ function readField(node, parentName, resolver, pageIndex, sink, out, visited) {
 		...(flags & FLAG_READ_ONLY) !== 0 ? { readOnly: true } : {},
 		widgets,
 		children: []
-	});
+	};
 }
 function mapFieldType(fieldType, flags) {
 	if (fieldType === "Tx") return "text";

package/dist/form.d.cts

@@ -1,9 +1,9 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
-import { n as PdfDict } from "./objects-B7HdMeWS.cjs";
+import { n as PdfDict } from "./objects-e2RS3-yT.cjs";
 import { PdfObjectResolver } from "./interpret.cjs";
 import { LayoutFormField } from "./layout.cjs";
 import { PageIndexLookup } from "./navigation.cjs";
 //#region src/form.d.ts
-declare function readAcroForm(catalog: PdfDict, resolver: PdfObjectResolver, pageIndex: PageIndexLookup, sink: PdfDiagnosticSink): LayoutFormField[];
+declare function readAcroForm(catalog: PdfDict, resolver: Readonly<PdfObjectResolver>, pageIndex: PageIndexLookup, sink: PdfDiagnosticSink): LayoutFormField[];
 //#endregion
 export { readAcroForm };

package/dist/form.d.ts

@@ -1,9 +1,9 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
-import { n as PdfDict } from "./objects-B7HdMeWS.js";
+import { n as PdfDict } from "./objects-e2RS3-yT.js";
 import { PdfObjectResolver } from "./interpret.js";
 import { LayoutFormField } from "./layout.js";
 import { PageIndexLookup } from "./navigation.js";
 //#region src/form.d.ts
-declare function readAcroForm(catalog: PdfDict, resolver: PdfObjectResolver, pageIndex: PageIndexLookup, sink: PdfDiagnosticSink): LayoutFormField[];
+declare function readAcroForm(catalog: PdfDict, resolver: Readonly<PdfObjectResolver>, pageIndex: PageIndexLookup, sink: PdfDiagnosticSink): LayoutFormField[];
 //#endregion
 export { readAcroForm };

package/dist/form.js

@@ -12,11 +12,14 @@ function readAcroForm(catalog, resolver, pageIndex, sink) {
 	const visited = /* @__PURE__ */ new Set();
 	for (const fieldRef of asArray(resolver.resolve(dictGet(acroForm, "Fields"))) ?? []) {
 		const fieldDict = resolver.resolveDict(fieldRef);
-		if (fieldDict !== void 0) readField(fieldDict, "", resolver, pageIndex, sink, fields, visited);
+		if (fieldDict !== void 0) {
+			const field = readField(fieldDict, "", resolver, pageIndex, sink, visited);
+			if (field !== void 0) fields.push(field);
+		}
 	}
 	return fields;
 }
-function readField(node, parentName, resolver, pageIndex, sink, out, visited) {
+function readField(node, parentName, resolver, pageIndex, sink, visited) {
 	if (visited.has(node)) {
 		sink({
 			code: "pdf/form-field-cycle",
@@ -34,15 +37,17 @@ function readField(node, parentName, resolver, pageIndex, sink, out, visited) {
 		const children = [];
 		for (const kidRef of asArray(resolver.resolve(dictGet(node, "Kids"))) ?? []) {
 			const kid = resolver.resolveDict(kidRef);
-			if (kid !== void 0) readField(kid, name, resolver, pageIndex, sink, children, visited);
+			if (kid !== void 0) {
+				const child = readField(kid, name, resolver, pageIndex, sink, visited);
+				if (child !== void 0) children.push(child);
+			}
 		}
-		out.push({
+		return {
 			name,
 			fieldType: "group",
 			widgets: [],
 			children
-		});
-		return;
+		};
 	}
 	const flags = asNumber(resolver.resolve(dictGet(node, "Ff"))) ?? 0;
 	const value = fieldValue(node, resolver);
@@ -59,7 +64,7 @@ function readField(node, parentName, resolver, pageIndex, sink, out, visited) {
 		const widget = widgetPlacement(node, pageIndex);
 		if (widget !== void 0) widgets.push(widget);
 	}
-	out.push({
+	return {
 		name,
 		fieldType: mapFieldType(fieldType, flags),
 		...valueFields(fieldType, value),
@@ -68,7 +73,7 @@ function readField(node, parentName, resolver, pageIndex, sink, out, visited) {
 		...(flags & FLAG_READ_ONLY) !== 0 ? { readOnly: true } : {},
 		widgets,
 		children: []
-	});
+	};
 }
 function mapFieldType(fieldType, flags) {
 	if (fieldType === "Tx") return "text";

package/dist/{glyf-contours-C0epBNqP.d.ts → glyf-contours-B1PsI9oA.d.ts}

@@ -8,6 +8,6 @@ interface GlyphContourPoint {
 interface GlyphOutline {
   readonly contours: readonly (readonly GlyphContourPoint[])[];
 }
-declare function decodeGlyphOutline(glyf: GlyfTable, glyphId: number): GlyphOutline | undefined;
+declare function decodeGlyphOutline(glyf: Readonly<GlyfTable>, glyphId: number): GlyphOutline | undefined;
 //#endregion
 export { GlyphOutline as n, decodeGlyphOutline as r, GlyphContourPoint as t };

package/dist/{glyf-contours-BRpvd0rt.d.cts → glyf-contours-NHBpgks-.d.cts}

@@ -8,6 +8,6 @@ interface GlyphContourPoint {
 interface GlyphOutline {
   readonly contours: readonly (readonly GlyphContourPoint[])[];
 }
-declare function decodeGlyphOutline(glyf: GlyfTable, glyphId: number): GlyphOutline | undefined;
+declare function decodeGlyphOutline(glyf: Readonly<GlyfTable>, glyphId: number): GlyphOutline | undefined;
 //#endregion
 export { GlyphOutline as n, decodeGlyphOutline as r, GlyphContourPoint as t };

package/dist/glyf-contours.d.cts

@@ -1,2 +1,2 @@
-import { n as GlyphOutline, r as decodeGlyphOutline, t as GlyphContourPoint } from "./glyf-contours-BRpvd0rt.cjs";
+import { n as GlyphOutline, r as decodeGlyphOutline, t as GlyphContourPoint } from "./glyf-contours-NHBpgks-.cjs";
 export { GlyphContourPoint, GlyphOutline, decodeGlyphOutline };

package/dist/glyf-contours.d.ts

@@ -1,2 +1,2 @@
-import { n as GlyphOutline, r as decodeGlyphOutline, t as GlyphContourPoint } from "./glyf-contours-C0epBNqP.js";
+import { n as GlyphOutline, r as decodeGlyphOutline, t as GlyphContourPoint } from "./glyf-contours-B1PsI9oA.js";
 export { GlyphContourPoint, GlyphOutline, decodeGlyphOutline };

package/dist/gsub-table.cjs

@@ -193,7 +193,10 @@ function applyContextualRule(slots, inputSlots, records, lookupOf, skip, depth)
 		const lookup = lookupOf(record.lookupIndex);
 		if (lookup === void 0 || record.sequenceIndex >= inputSlots.length || depth >= MAX_LOOKUP_NESTING_DEPTH) return;
 		const target = visibleInputSlot(window, record.sequenceIndex, skip);
-		if (target !== void 0) applyLookupAtSlot(window, target, lookup, depth + 1);
+		if (target !== void 0) {
+			const application = applyLookupAtSlot(window, target, lookup, depth + 1);
+			if (application !== void 0) window.splice(target, application.consumed, ...application.replacement);
+		}
 	}
 	return {
 		consumed: last - first + 1,
@@ -211,12 +214,8 @@ function visibleInputSlot(window, position, skip) {
 function applyLookupAtSlot(slots, index, lookup, depth) {
 	for (const subtable of lookup.subtables) {
 		const application = subtable(slots, index, depth);
-		if (application !== void 0) {
-			slots.splice(index, application.consumed, ...application.replacement);
-			return application.replacement.length;
-		}
+		if (application !== void 0) return application;
 	}
-	return 0;
 }
 const SUBST_LOOKUP_RECORD_SIZE = 4;
 function readSubstLookupRecords(bytes, offset, count) {
@@ -526,8 +525,13 @@ function buildGsubShaper(font, options = {}) {
 		for (const lookup of appliedLookups) {
 			let slotIndex = 0;
 			while (slotIndex < slots.length) {
-				const advanced = applyLookupAtSlot(slots, slotIndex, lookup, 0);
-				slotIndex += advanced !== 0 ? advanced : 1;
+				const application = applyLookupAtSlot(slots, slotIndex, lookup, 0);
+				if (application === void 0) {
+					slotIndex += 1;
+					continue;
+				}
+				slots.splice(slotIndex, application.consumed, ...application.replacement);
+				slotIndex += application.replacement.length !== 0 ? application.replacement.length : 1;
 			}
 		}
 		return {

package/dist/gsub-table.js

@@ -192,7 +192,10 @@ function applyContextualRule(slots, inputSlots, records, lookupOf, skip, depth)
 		const lookup = lookupOf(record.lookupIndex);
 		if (lookup === void 0 || record.sequenceIndex >= inputSlots.length || depth >= MAX_LOOKUP_NESTING_DEPTH) return;
 		const target = visibleInputSlot(window, record.sequenceIndex, skip);
-		if (target !== void 0) applyLookupAtSlot(window, target, lookup, depth + 1);
+		if (target !== void 0) {
+			const application = applyLookupAtSlot(window, target, lookup, depth + 1);
+			if (application !== void 0) window.splice(target, application.consumed, ...application.replacement);
+		}
 	}
 	return {
 		consumed: last - first + 1,
@@ -210,12 +213,8 @@ function visibleInputSlot(window, position, skip) {
 function applyLookupAtSlot(slots, index, lookup, depth) {
 	for (const subtable of lookup.subtables) {
 		const application = subtable(slots, index, depth);
-		if (application !== void 0) {
-			slots.splice(index, application.consumed, ...application.replacement);
-			return application.replacement.length;
-		}
+		if (application !== void 0) return application;
 	}
-	return 0;
 }
 const SUBST_LOOKUP_RECORD_SIZE = 4;
 function readSubstLookupRecords(bytes, offset, count) {
@@ -525,8 +524,13 @@ function buildGsubShaper(font, options = {}) {
 		for (const lookup of appliedLookups) {
 			let slotIndex = 0;
 			while (slotIndex < slots.length) {
-				const advanced = applyLookupAtSlot(slots, slotIndex, lookup, 0);
-				slotIndex += advanced !== 0 ? advanced : 1;
+				const application = applyLookupAtSlot(slots, slotIndex, lookup, 0);
+				if (application === void 0) {
+					slotIndex += 1;
+					continue;
+				}
+				slots.splice(slotIndex, application.consumed, ...application.replacement);
+				slotIndex += application.replacement.length !== 0 ? application.replacement.length : 1;
 			}
 		}
 		return {

package/dist/image/jpeg2000-codestream.cjs

@@ -201,6 +201,15 @@ function freezeHeader(header) {
 	};
 	return base;
 }
+var CodestreamComments = class {
+	#texts = [];
+	add(text) {
+		this.#texts.push(text);
+	}
+	texts() {
+		return this.#texts;
+	}
+};
 function readHeaderSegment(marker, cursor, header, componentCount, comments) {
 	const length = cursor.uint16();
 	if (length < 2) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`marker segment 0x${marker.toString(16)} declares a length of ${String(length)}, which is shorter than the length field itself`);
@@ -220,7 +229,7 @@ function readHeaderSegment(marker, cursor, header, componentCount, comments) {
 	else if (marker === MARKER_COM) {
 		const registration = cursor.uint16();
 		const body = cursor.bytes(segmentEnd - cursor.position);
-		if (registration === 1) comments.push(Array.from(body, (byte) => String.fromCharCode(byte)).join(""));
+		if (registration === 1) comments.add(Array.from(body, (byte) => String.fromCharCode(byte)).join(""));
 	}
 	cursor.position = segmentEnd;
 }
@@ -236,7 +245,7 @@ function parseJpeg2000Codestream(data) {
 	const sizEnd = cursor.position + sizLength - 2;
 	const siz = readImageSize(cursor, sizEnd);
 	cursor.position = sizEnd;
-	const comments = [];
+	const comments = new CodestreamComments();
 	const main = emptyHeader();
 	const tileParts = [];
 	let sawEoc = false;
@@ -250,7 +259,7 @@ function parseJpeg2000Codestream(data) {
 		if (marker === MARKER_PPM) throw new require_image_jpeg2000_errors.Jpeg2000UnsupportedError("the codestream carries a PPM marker (packed packet headers in the main header), an organisation this decoder does not reassemble");
 		if (marker === MARKER_SOT) {
 			cursor.position -= 2;
-			readTilePart(cursor, siz.components.length, tileParts, comments);
+			tileParts.push(readTilePart(cursor, siz.components.length, comments));
 			continue;
 		}
 		if (marker === MARKER_SOD || marker === MARKER_SOC) throw new require_image_jpeg2000_errors.Jpeg2000ParseError(`unexpected marker 0x${marker.toString(16)} in the main header`);
@@ -264,13 +273,13 @@ function parseJpeg2000Codestream(data) {
 		siz,
 		main: freezeHeader(main),
 		tileParts,
-		comments,
+		comments: comments.texts(),
 		numTilesWide,
 		numTilesHigh,
 		truncated: !sawEoc
 	};
 }
-function readTilePart(cursor, componentCount, tileParts, comments) {
+function readTilePart(cursor, componentCount, comments) {
 	const sotStart = cursor.position;
 	cursor.uint16();
 	const lsot = cursor.uint16();
@@ -292,14 +301,14 @@ function readTilePart(cursor, componentCount, tileParts, comments) {
 	const dataEnd = Math.min(declaredEnd, cursor.data.length);
 	if (dataEnd < dataStart) throw new require_image_jpeg2000_errors.Jpeg2000ParseError("a tile-part declares a Psot shorter than its own header");
 	const trimmedEnd = trimTrailingEoc(cursor.data, dataEnd);
-	tileParts.push({
+	cursor.position = dataEnd;
+	return {
 		tileIndex,
 		partIndex,
 		header: freezeHeader(header),
 		dataStart,
 		dataEnd: trimmedEnd
-	});
-	cursor.position = dataEnd;
+	};
 }
 function trimTrailingEoc(data, end) {
 	if (data[end - 2] === 255 && data[end - 1] === 217) return end - 2;

package/dist/image/jpeg2000-codestream.js

@@ -200,6 +200,15 @@ function freezeHeader(header) {
 	};
 	return base;
 }
+var CodestreamComments = class {
+	#texts = [];
+	add(text) {
+		this.#texts.push(text);
+	}
+	texts() {
+		return this.#texts;
+	}
+};
 function readHeaderSegment(marker, cursor, header, componentCount, comments) {
 	const length = cursor.uint16();
 	if (length < 2) throw new Jpeg2000ParseError(`marker segment 0x${marker.toString(16)} declares a length of ${String(length)}, which is shorter than the length field itself`);
@@ -219,7 +228,7 @@ function readHeaderSegment(marker, cursor, header, componentCount, comments) {
 	else if (marker === MARKER_COM) {
 		const registration = cursor.uint16();
 		const body = cursor.bytes(segmentEnd - cursor.position);
-		if (registration === 1) comments.push(Array.from(body, (byte) => String.fromCharCode(byte)).join(""));
+		if (registration === 1) comments.add(Array.from(body, (byte) => String.fromCharCode(byte)).join(""));
 	}
 	cursor.position = segmentEnd;
 }
@@ -235,7 +244,7 @@ function parseJpeg2000Codestream(data) {
 	const sizEnd = cursor.position + sizLength - 2;
 	const siz = readImageSize(cursor, sizEnd);
 	cursor.position = sizEnd;
-	const comments = [];
+	const comments = new CodestreamComments();
 	const main = emptyHeader();
 	const tileParts = [];
 	let sawEoc = false;
@@ -249,7 +258,7 @@ function parseJpeg2000Codestream(data) {
 		if (marker === MARKER_PPM) throw new Jpeg2000UnsupportedError("the codestream carries a PPM marker (packed packet headers in the main header), an organisation this decoder does not reassemble");
 		if (marker === MARKER_SOT) {
 			cursor.position -= 2;
-			readTilePart(cursor, siz.components.length, tileParts, comments);
+			tileParts.push(readTilePart(cursor, siz.components.length, comments));
 			continue;
 		}
 		if (marker === MARKER_SOD || marker === MARKER_SOC) throw new Jpeg2000ParseError(`unexpected marker 0x${marker.toString(16)} in the main header`);
@@ -263,13 +272,13 @@ function parseJpeg2000Codestream(data) {
 		siz,
 		main: freezeHeader(main),
 		tileParts,
-		comments,
+		comments: comments.texts(),
 		numTilesWide,
 		numTilesHigh,
 		truncated: !sawEoc
 	};
 }
-function readTilePart(cursor, componentCount, tileParts, comments) {
+function readTilePart(cursor, componentCount, comments) {
 	const sotStart = cursor.position;
 	cursor.uint16();
 	const lsot = cursor.uint16();
@@ -291,14 +300,14 @@ function readTilePart(cursor, componentCount, tileParts, comments) {
 	const dataEnd = Math.min(declaredEnd, cursor.data.length);
 	if (dataEnd < dataStart) throw new Jpeg2000ParseError("a tile-part declares a Psot shorter than its own header");
 	const trimmedEnd = trimTrailingEoc(cursor.data, dataEnd);
-	tileParts.push({
+	cursor.position = dataEnd;
+	return {
 		tileIndex,
 		partIndex,
 		header: freezeHeader(header),
 		dataStart,
 		dataEnd: trimmedEnd
-	});
-	cursor.position = dataEnd;
+	};
 }
 function trimTrailingEoc(data, end) {
 	if (data[end - 2] === 255 && data[end - 1] === 217) return end - 2;

package/dist/images-read.d.cts

@@ -1,5 +1,5 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
-import { n as PdfDict } from "./objects-B7HdMeWS.cjs";
+import { n as PdfDict } from "./objects-e2RS3-yT.cjs";
 import { PdfObjectResolver } from "./interpret.cjs";
 //#region src/images-read.d.ts
 interface ExtractedPdfImage {
@@ -13,6 +13,6 @@ interface ExtractedPdfImage {
     readonly globalsBytes?: Uint8Array<ArrayBuffer>;
   };
 }
-declare function readImageXObject(dict: PdfDict, raw: Uint8Array<ArrayBuffer>, resolver: PdfObjectResolver, sink: PdfDiagnosticSink): ExtractedPdfImage | undefined;
+declare function readImageXObject(dict: PdfDict, raw: Uint8Array<ArrayBuffer>, resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): ExtractedPdfImage | undefined;
 //#endregion
 export { ExtractedPdfImage, readImageXObject };

package/dist/images-read.d.ts

@@ -1,5 +1,5 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
-import { n as PdfDict } from "./objects-B7HdMeWS.js";
+import { n as PdfDict } from "./objects-e2RS3-yT.js";
 import { PdfObjectResolver } from "./interpret.js";
 //#region src/images-read.d.ts
 interface ExtractedPdfImage {
@@ -13,6 +13,6 @@ interface ExtractedPdfImage {
     readonly globalsBytes?: Uint8Array<ArrayBuffer>;
   };
 }
-declare function readImageXObject(dict: PdfDict, raw: Uint8Array<ArrayBuffer>, resolver: PdfObjectResolver, sink: PdfDiagnosticSink): ExtractedPdfImage | undefined;
+declare function readImageXObject(dict: PdfDict, raw: Uint8Array<ArrayBuffer>, resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): ExtractedPdfImage | undefined;
 //#endregion
 export { ExtractedPdfImage, readImageXObject };

package/dist/index.d.cts

@@ -3,7 +3,7 @@ import { NOOP_DIAGNOSTIC_SINK, PdfDiagnostic, PdfDiagnosticSeverity, PdfDiagnost
 import { LAYOUT_FORMAT_VERSION, LayoutAnnotation, LayoutAnnotationQuad, LayoutAnnotationQuadSchema, LayoutAnnotationSchema, LayoutAttachment, LayoutAttachmentSchema, LayoutDestination, LayoutDestinationSchema, LayoutDestinationTarget, LayoutDestinationTargetSchema, LayoutDocument, LayoutDocumentSchema, LayoutEllipse, LayoutEllipseSchema, LayoutFormField, LayoutFormFieldSchema, LayoutFormWidget, LayoutFormWidgetSchema, LayoutImage, LayoutImageAsset, LayoutImageAssetSchema, LayoutImageSchema, LayoutInternalLink, LayoutInternalLinkSchema, LayoutItem, LayoutItemSchema, LayoutLayer, LayoutLayerSchema, LayoutLine, LayoutLineSchema, LayoutLink, LayoutLinkSchema, LayoutOutlineItem, LayoutOutlineItemSchema, LayoutPage, LayoutPageSchema, LayoutPath, LayoutPathSchema, LayoutPathSegment, LayoutPathSegmentSchema, LayoutRect, LayoutRectSchema, LayoutStructureElement, LayoutStructureElementSchema, LayoutSubpath, LayoutSubpathSchema, LayoutText, LayoutTextSchema } from "./layout.cjs";
 import { t as GlyphInkBounds } from "./glyph-bounds-BV_Z40KS.cjs";
 import { PdfBytesSchema, pdfCodec } from "./codec.cjs";
-import { n as EmbeddedFaceMetrics, r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-CEf-zBCA.cjs";
+import { n as EmbeddedFaceMetrics, r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-DgVBedw6.cjs";
 import { WinAnsiSubstitution } from "./winansi.cjs";
 import { PdfEncryptionError, PdfEncryptionOptions, PdfEncryptionPermissions, PdfEncryptionScheme } from "./encrypt-write.cjs";
 import { FontFace, FontFaceParseError, readFontFace } from "./font-face.cjs";

package/dist/index.d.ts

@@ -3,7 +3,7 @@ import { NOOP_DIAGNOSTIC_SINK, PdfDiagnostic, PdfDiagnosticSeverity, PdfDiagnost
 import { LAYOUT_FORMAT_VERSION, LayoutAnnotation, LayoutAnnotationQuad, LayoutAnnotationQuadSchema, LayoutAnnotationSchema, LayoutAttachment, LayoutAttachmentSchema, LayoutDestination, LayoutDestinationSchema, LayoutDestinationTarget, LayoutDestinationTargetSchema, LayoutDocument, LayoutDocumentSchema, LayoutEllipse, LayoutEllipseSchema, LayoutFormField, LayoutFormFieldSchema, LayoutFormWidget, LayoutFormWidgetSchema, LayoutImage, LayoutImageAsset, LayoutImageAssetSchema, LayoutImageSchema, LayoutInternalLink, LayoutInternalLinkSchema, LayoutItem, LayoutItemSchema, LayoutLayer, LayoutLayerSchema, LayoutLine, LayoutLineSchema, LayoutLink, LayoutLinkSchema, LayoutOutlineItem, LayoutOutlineItemSchema, LayoutPage, LayoutPageSchema, LayoutPath, LayoutPathSchema, LayoutPathSegment, LayoutPathSegmentSchema, LayoutRect, LayoutRectSchema, LayoutStructureElement, LayoutStructureElementSchema, LayoutSubpath, LayoutSubpathSchema, LayoutText, LayoutTextSchema } from "./layout.js";
 import { t as GlyphInkBounds } from "./glyph-bounds-BV_Z40KS.js";
 import { PdfBytesSchema, pdfCodec } from "./codec.js";
-import { n as EmbeddedFaceMetrics, r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-Bnhh4juV.js";
+import { n as EmbeddedFaceMetrics, r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-ByD7ZiQS.js";
 import { WinAnsiSubstitution } from "./winansi.js";
 import { PdfEncryptionError, PdfEncryptionOptions, PdfEncryptionPermissions, PdfEncryptionScheme } from "./encrypt-write.js";
 import { FontFace, FontFaceParseError, readFontFace } from "./font-face.js";