pdf-parser.js 5.2.25 → 5.2.27

package/dist/ot-layout-common.js

@@ -11,21 +11,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) {
@@ -55,7 +52,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;
@@ -83,7 +84,11 @@ function parseClassDef(bytes, classDefOffset) {
 		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

@@ -22,6 +22,10 @@ function parseValue(reader, sink) {
 			});
 			return require_objects.pdfNull();
 	}
+	return assertNeverToken(token);
+}
+function assertNeverToken(token) {
+	throw new Error(`parseValue: unhandled token ${JSON.stringify(token)}`);
 }
 function parseKeywordValue(keyword, sink) {
 	if (keyword === "true") return require_objects.pdfBool(true);
@@ -226,5 +230,6 @@ function parseIndirectObject(reader, sink) {
 	};
 }
 //#endregion
+exports.assertNeverToken = assertNeverToken;
 exports.parseIndirectObject = parseIndirectObject;
 exports.parseValue = parseValue;

package/dist/parse.d.cts

@@ -1,8 +1,9 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
-import { r as PdfObject } from "./objects-B7HdMeWS.cjs";
+import { r as PdfObject } from "./objects-e2RS3-yT.cjs";
 import { ByteReader } from "./bytes/reader.cjs";
 //#region src/parse.d.ts
 declare function parseValue(reader: ByteReader, sink: PdfDiagnosticSink): PdfObject | undefined;
+declare function assertNeverToken(token: never): never;
 interface ParsedIndirectObject {
   readonly num: number;
   readonly gen: number;
@@ -10,4 +11,4 @@ interface ParsedIndirectObject {
 }
 declare function parseIndirectObject(reader: ByteReader, sink: PdfDiagnosticSink): ParsedIndirectObject | undefined;
 //#endregion
-export { ParsedIndirectObject, parseIndirectObject, parseValue };
+export { ParsedIndirectObject, assertNeverToken, parseIndirectObject, parseValue };

package/dist/parse.d.ts

@@ -1,8 +1,9 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
-import { r as PdfObject } from "./objects-B7HdMeWS.js";
+import { r as PdfObject } from "./objects-e2RS3-yT.js";
 import { ByteReader } from "./bytes/reader.js";
 //#region src/parse.d.ts
 declare function parseValue(reader: ByteReader, sink: PdfDiagnosticSink): PdfObject | undefined;
+declare function assertNeverToken(token: never): never;
 interface ParsedIndirectObject {
   readonly num: number;
   readonly gen: number;
@@ -10,4 +11,4 @@ interface ParsedIndirectObject {
 }
 declare function parseIndirectObject(reader: ByteReader, sink: PdfDiagnosticSink): ParsedIndirectObject | undefined;
 //#endregion
-export { ParsedIndirectObject, parseIndirectObject, parseValue };
+export { ParsedIndirectObject, assertNeverToken, parseIndirectObject, parseValue };

package/dist/parse.js

@@ -21,6 +21,10 @@ function parseValue(reader, sink) {
 			});
 			return pdfNull();
 	}
+	return assertNeverToken(token);
+}
+function assertNeverToken(token) {
+	throw new Error(`parseValue: unhandled token ${JSON.stringify(token)}`);
 }
 function parseKeywordValue(keyword, sink) {
 	if (keyword === "true") return pdfBool(true);
@@ -225,4 +229,4 @@ function parseIndirectObject(reader, sink) {
 	};
 }
 //#endregion
-export { parseIndirectObject, parseValue };
+export { assertNeverToken, parseIndirectObject, parseValue };

package/dist/predictors.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";
 //#region src/predictors.d.ts
 interface PredictorParams {
   readonly predictor: number;

package/dist/predictors.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";
 //#region src/predictors.d.ts
 interface PredictorParams {
   readonly predictor: number;

package/dist/raster.cjs

@@ -533,39 +533,18 @@ function buildTextOutlineFace(fontDict, resolver, fontResolver, fontResourceName
 	const subtype = require_objects.asName(require_objects.dictGet(fontDict, "Subtype"));
 	if (subtype === "Type0") {
 		const encoding = resolver.resolve(require_objects.dictGet(fontDict, "Encoding"));
-		if (encoding?.kind !== "name" || encoding.name !== "Identity-H" && encoding.name !== "Identity-V") {
-			unavailable("a Type0 font whose /Encoding is neither Identity-H nor Identity-V (a predefined or embedded CMap this raster walk does not decode)");
-			return;
-		}
+		if (encoding?.kind !== "name" || encoding.name !== "Identity-H" && encoding.name !== "Identity-V") return unavailable("a Type0 font whose /Encoding is neither Identity-H nor Identity-V (a predefined or embedded CMap this raster walk does not decode)");
 		const descendants = require_objects.asArray(require_objects.dictGet(fontDict, "DescendantFonts"));
 		const descendant = descendants !== void 0 ? resolver.resolveDict(descendants[0]) : void 0;
-		if (descendant === void 0) {
-			unavailable("a Type0 font with no readable /DescendantFonts entry");
-			return;
-		}
+		if (descendant === void 0) return unavailable("a Type0 font with no readable /DescendantFonts entry");
 		const descendantSubtype = require_objects.asName(require_objects.dictGet(descendant, "Subtype"));
-		if (descendantSubtype === "CIDFontType0") {
-			cff();
-			return;
-		}
-		if (descendantSubtype !== "CIDFontType2") {
-			unavailable(`a descendant font of subtype ${descendantSubtype ?? "(none)"}`);
-			return;
-		}
+		if (descendantSubtype === "CIDFontType0") return cff();
+		if (descendantSubtype !== "CIDFontType2") return unavailable(`a descendant font of subtype ${descendantSubtype ?? "(none)"}`);
 		const cidToGidMap = resolver.resolve(require_objects.dictGet(descendant, "CIDToGIDMap"));
 		const program = openEmbeddedProgram(descendant, resolver);
-		if (program.kind === "cff") {
-			cff();
-			return;
-		}
-		if (program.kind === "absent") {
-			unavailable("no readable /FontFile2 (or glyf-bearing /FontFile3) stream");
-			return;
-		}
-		if (cidToGidMap !== void 0 && cidToGidMap.kind !== "name" && cidToGidMap.kind !== "stream") {
-			unavailable("a /CIDToGIDMap that is neither /Identity nor a readable stream");
-			return;
-		}
+		if (program.kind === "cff") return cff();
+		if (program.kind === "absent") return unavailable("no readable /FontFile2 (or glyf-bearing /FontFile3) stream");
+		if (cidToGidMap !== void 0 && cidToGidMap.kind !== "name" && cidToGidMap.kind !== "stream") return unavailable("a /CIDToGIDMap that is neither /Identity nor a readable stream");
 		if (cidToGidMap?.kind === "stream") {
 			const decodedBytes = require_filters.decodeStream(cidToGidMap.raw, cidToGidMap.dict, require_diagnostics.NOOP_DIAGNOSTIC_SINK).bytes;
 			const entries = [];
@@ -587,19 +566,10 @@ function buildTextOutlineFace(fontDict, resolver, fontResolver, fontResourceName
 	}
 	if (subtype === "TrueType") {
 		const program = openEmbeddedProgram(fontDict, resolver);
-		if (program.kind === "cff") {
-			cff();
-			return;
-		}
-		if (program.kind === "absent") {
-			unavailable("no /FontDescriptor or no readable embedded program (a standard-14 or otherwise unembedded face states no outlines at all)");
-			return;
-		}
+		if (program.kind === "cff") return cff();
+		if (program.kind === "absent") return unavailable("no /FontDescriptor or no readable embedded program (a standard-14 or otherwise unembedded face states no outlines at all)");
 		const cmapLookup = require_cmap_table.buildCmapLookup(program.sfnt);
-		if (cmapLookup === void 0) {
-			unavailable("an embedded program with no usable Unicode cmap subtable");
-			return;
-		}
+		if (cmapLookup === void 0) return unavailable("an embedded program with no usable Unicode cmap subtable");
 		return {
 			glyf: program.face.glyf,
 			unitsPerEm: program.face.unitsPerEm,

package/dist/raster.d.cts

@@ -1,6 +1,6 @@
 import { PdfDiagnosticSink } from "./diagnostics.cjs";
 import { r as Matrix } from "./matrix-B7_SBKQ5.cjs";
-import { n as GlyphOutline } from "./glyf-contours-zRQbj-Yp.cjs";
+import { n as GlyphOutline } from "./glyf-contours-NHBpgks-.cjs";
 import { Color } from "document-schema.js";
 //#region src/raster.d.ts
 type RasterMatrix = readonly [number, number, number, number, number, number];
@@ -63,9 +63,9 @@ interface RasterPageGeometry {
   readonly heightPt: number;
 }
 interface PageRasteriser {
-  beginPage(geometry: RasterPageGeometry): void;
-  draw(op: RasterDrawOp): void;
-  finish(): Uint8Array<ArrayBuffer> | Promise<Uint8Array<ArrayBuffer>>;
+  beginPage: (geometry: RasterPageGeometry) => void;
+  draw: (op: RasterDrawOp) => void;
+  finish: () => Uint8Array<ArrayBuffer> | Promise<Uint8Array<ArrayBuffer>>;
 }
 interface RasterRegionPt {
   readonly xPt: number;
@@ -80,24 +80,24 @@ interface RenderPdfPageOptions {
   readonly sink?: PdfDiagnosticSink;
   readonly signal?: AbortSignal;
 }
-declare function renderPdfPage(pdfBytes: Uint8Array<ArrayBuffer>, pageIndex: number, options: RenderPdfPageOptions, rasteriser: PageRasteriser): Uint8Array<ArrayBuffer> | Promise<Uint8Array<ArrayBuffer>>;
-declare function flattenCubic(p0: {
+declare function renderPdfPage(pdfBytes: Uint8Array<ArrayBuffer>, pageIndex: number, options: RenderPdfPageOptions, rasteriser: Readonly<PageRasteriser>): Uint8Array<ArrayBuffer> | Promise<Uint8Array<ArrayBuffer>>;
+declare function flattenCubic(p0: Readonly<{
   x: number;
   y: number;
-}, c1: {
+}>, c1: Readonly<{
   x: number;
   y: number;
-}, c2: {
+}>, c2: Readonly<{
   x: number;
   y: number;
-}, p1: {
+}>, p1: Readonly<{
   x: number;
   y: number;
-}): readonly {
+}>): readonly {
   x: number;
   y: number;
 }[];
-declare function drawGlyphOutline(outline: GlyphOutline, glyphMatrix: Matrix, color: Color, rasteriser: PageRasteriser): void;
+declare function drawGlyphOutline(outline: GlyphOutline, glyphMatrix: Matrix, color: Readonly<Color>, rasteriser: Readonly<PageRasteriser>): void;
 declare function glyphOutlineSubpaths(outline: GlyphOutline, matrix: Matrix): readonly RasterSubpath[];
 //#endregion
 export { PageRasteriser, RasterDrawOp, RasterFillRectOp, RasterFillSpec, RasterImageOp, RasterMatrix, RasterPageGeometry, RasterPathOp, RasterPathSegment, RasterRegionPt, RasterStrokeSpec, RasterSubpath, RenderPdfPageOptions, drawGlyphOutline, flattenCubic, glyphOutlineSubpaths, renderPdfPage };

package/dist/raster.d.ts

@@ -1,6 +1,6 @@
 import { PdfDiagnosticSink } from "./diagnostics.js";
 import { r as Matrix } from "./matrix-B7_SBKQ5.js";
-import { n as GlyphOutline } from "./glyf-contours-OSdG6Edr.js";
+import { n as GlyphOutline } from "./glyf-contours-B1PsI9oA.js";
 import { Color } from "document-schema.js";
 //#region src/raster.d.ts
 type RasterMatrix = readonly [number, number, number, number, number, number];
@@ -63,9 +63,9 @@ interface RasterPageGeometry {
   readonly heightPt: number;
 }
 interface PageRasteriser {
-  beginPage(geometry: RasterPageGeometry): void;
-  draw(op: RasterDrawOp): void;
-  finish(): Uint8Array<ArrayBuffer> | Promise<Uint8Array<ArrayBuffer>>;
+  beginPage: (geometry: RasterPageGeometry) => void;
+  draw: (op: RasterDrawOp) => void;
+  finish: () => Uint8Array<ArrayBuffer> | Promise<Uint8Array<ArrayBuffer>>;
 }
 interface RasterRegionPt {
   readonly xPt: number;
@@ -80,24 +80,24 @@ interface RenderPdfPageOptions {
   readonly sink?: PdfDiagnosticSink;
   readonly signal?: AbortSignal;
 }
-declare function renderPdfPage(pdfBytes: Uint8Array<ArrayBuffer>, pageIndex: number, options: RenderPdfPageOptions, rasteriser: PageRasteriser): Uint8Array<ArrayBuffer> | Promise<Uint8Array<ArrayBuffer>>;
-declare function flattenCubic(p0: {
+declare function renderPdfPage(pdfBytes: Uint8Array<ArrayBuffer>, pageIndex: number, options: RenderPdfPageOptions, rasteriser: Readonly<PageRasteriser>): Uint8Array<ArrayBuffer> | Promise<Uint8Array<ArrayBuffer>>;
+declare function flattenCubic(p0: Readonly<{
   x: number;
   y: number;
-}, c1: {
+}>, c1: Readonly<{
   x: number;
   y: number;
-}, c2: {
+}>, c2: Readonly<{
   x: number;
   y: number;
-}, p1: {
+}>, p1: Readonly<{
   x: number;
   y: number;
-}): readonly {
+}>): readonly {
   x: number;
   y: number;
 }[];
-declare function drawGlyphOutline(outline: GlyphOutline, glyphMatrix: Matrix, color: Color, rasteriser: PageRasteriser): void;
+declare function drawGlyphOutline(outline: GlyphOutline, glyphMatrix: Matrix, color: Readonly<Color>, rasteriser: Readonly<PageRasteriser>): void;
 declare function glyphOutlineSubpaths(outline: GlyphOutline, matrix: Matrix): readonly RasterSubpath[];
 //#endregion
 export { PageRasteriser, RasterDrawOp, RasterFillRectOp, RasterFillSpec, RasterImageOp, RasterMatrix, RasterPageGeometry, RasterPathOp, RasterPathSegment, RasterRegionPt, RasterStrokeSpec, RasterSubpath, RenderPdfPageOptions, drawGlyphOutline, flattenCubic, glyphOutlineSubpaths, renderPdfPage };

package/dist/raster.js

@@ -532,39 +532,18 @@ function buildTextOutlineFace(fontDict, resolver, fontResolver, fontResourceName
 	const subtype = asName(dictGet(fontDict, "Subtype"));
 	if (subtype === "Type0") {
 		const encoding = resolver.resolve(dictGet(fontDict, "Encoding"));
-		if (encoding?.kind !== "name" || encoding.name !== "Identity-H" && encoding.name !== "Identity-V") {
-			unavailable("a Type0 font whose /Encoding is neither Identity-H nor Identity-V (a predefined or embedded CMap this raster walk does not decode)");
-			return;
-		}
+		if (encoding?.kind !== "name" || encoding.name !== "Identity-H" && encoding.name !== "Identity-V") return unavailable("a Type0 font whose /Encoding is neither Identity-H nor Identity-V (a predefined or embedded CMap this raster walk does not decode)");
 		const descendants = asArray(dictGet(fontDict, "DescendantFonts"));
 		const descendant = descendants !== void 0 ? resolver.resolveDict(descendants[0]) : void 0;
-		if (descendant === void 0) {
-			unavailable("a Type0 font with no readable /DescendantFonts entry");
-			return;
-		}
+		if (descendant === void 0) return unavailable("a Type0 font with no readable /DescendantFonts entry");
 		const descendantSubtype = asName(dictGet(descendant, "Subtype"));
-		if (descendantSubtype === "CIDFontType0") {
-			cff();
-			return;
-		}
-		if (descendantSubtype !== "CIDFontType2") {
-			unavailable(`a descendant font of subtype ${descendantSubtype ?? "(none)"}`);
-			return;
-		}
+		if (descendantSubtype === "CIDFontType0") return cff();
+		if (descendantSubtype !== "CIDFontType2") return unavailable(`a descendant font of subtype ${descendantSubtype ?? "(none)"}`);
 		const cidToGidMap = resolver.resolve(dictGet(descendant, "CIDToGIDMap"));
 		const program = openEmbeddedProgram(descendant, resolver);
-		if (program.kind === "cff") {
-			cff();
-			return;
-		}
-		if (program.kind === "absent") {
-			unavailable("no readable /FontFile2 (or glyf-bearing /FontFile3) stream");
-			return;
-		}
-		if (cidToGidMap !== void 0 && cidToGidMap.kind !== "name" && cidToGidMap.kind !== "stream") {
-			unavailable("a /CIDToGIDMap that is neither /Identity nor a readable stream");
-			return;
-		}
+		if (program.kind === "cff") return cff();
+		if (program.kind === "absent") return unavailable("no readable /FontFile2 (or glyf-bearing /FontFile3) stream");
+		if (cidToGidMap !== void 0 && cidToGidMap.kind !== "name" && cidToGidMap.kind !== "stream") return unavailable("a /CIDToGIDMap that is neither /Identity nor a readable stream");
 		if (cidToGidMap?.kind === "stream") {
 			const decodedBytes = decodeStream(cidToGidMap.raw, cidToGidMap.dict, NOOP_DIAGNOSTIC_SINK).bytes;
 			const entries = [];
@@ -586,19 +565,10 @@ function buildTextOutlineFace(fontDict, resolver, fontResolver, fontResourceName
 	}
 	if (subtype === "TrueType") {
 		const program = openEmbeddedProgram(fontDict, resolver);
-		if (program.kind === "cff") {
-			cff();
-			return;
-		}
-		if (program.kind === "absent") {
-			unavailable("no /FontDescriptor or no readable embedded program (a standard-14 or otherwise unembedded face states no outlines at all)");
-			return;
-		}
+		if (program.kind === "cff") return cff();
+		if (program.kind === "absent") return unavailable("no /FontDescriptor or no readable embedded program (a standard-14 or otherwise unembedded face states no outlines at all)");
 		const cmapLookup = buildCmapLookup(program.sfnt);
-		if (cmapLookup === void 0) {
-			unavailable("an embedded program with no usable Unicode cmap subtable");
-			return;
-		}
+		if (cmapLookup === void 0) return unavailable("an embedded program with no usable Unicode cmap subtable");
 		return {
 			glyf: program.face.glyf,
 			unitsPerEm: program.face.unitsPerEm,

package/dist/read.cjs

@@ -58,7 +58,9 @@ function readPdf(bytes, options) {
 	const pageBoxRows = [];
 	const pages = pageDicts.map((pageDict, index) => {
 		require_util_abort.throwIfAborted(signal);
-		return readPage(index, pageDict, doc, fontResolver, images, imageIdCache, destinationRegistry, optionalContent.layerNameOf, structure.ownerOf, pageBoxRows, sink);
+		const read = readPage(index, pageDict, doc, fontResolver, images, imageIdCache, destinationRegistry, optionalContent.layerNameOf, structure.ownerOf, sink);
+		if (read.boxRow !== void 0) pageBoxRows.push(read.boxRow);
+		return read.page;
 	});
 	if (pageBoxRows.length > 0) source["page-boxes"] = {
 		format: "pdf",
@@ -275,7 +277,7 @@ function pageBoxResidueEntry(pageIndex, page, mediaBox, cropBox) {
 	for (const [key, value] of declaredBoxes) if (value !== void 0) entries[key] = value;
 	return require_objects.pdfDict(entries);
 }
-function readPage(pageIndex, page, resolver, fontResolver, images, imageIdCache, destinationRegistry, layerNameOf, structureOwnerOf, pageBoxRows, sink) {
+function readPage(pageIndex, page, resolver, fontResolver, images, imageIdCache, destinationRegistry, layerNameOf, structureOwnerOf, sink) {
 	const resources = resolver.resolveDict(require_objects.dictGet(page, "Resources"));
 	const mediaBox = readMediaBox(page);
 	let cropBox = readDeclaredPageBox(page, "CropBox") ?? mediaBox;
@@ -294,7 +296,6 @@ function readPage(pageIndex, page, resolver, fontResolver, images, imageIdCache,
 	const heightPt = visibleRect.maxY - visibleRect.minY;
 	const pageMatrix = require_matrix.multiplyMatrices(rotationResult.matrix, require_matrix.translationMatrix(-visibleRect.minX, -visibleRect.minY));
 	const boxRow = pageBoxResidueEntry(pageIndex, page, mediaBox, cropBox);
-	if (boxRow !== void 0) pageBoxRows.push(boxRow);
 	const items = [];
 	if (resources !== void 0) {
 		const contentBytes = readPageContentBytes(page, resolver, sink);
@@ -319,11 +320,14 @@ function readPage(pageIndex, page, resolver, fontResolver, images, imageIdCache,
 	const notes = readPageNotes(page, resolver);
 	const annotations = require_annotations.readPageAnnotations(page, pageMatrix, resolver, sink);
 	return {
-		widthPt,
-		heightPt,
-		items,
-		...notes !== void 0 ? { notes } : {},
-		...annotations.length > 0 ? { annotations } : {}
+		page: {
+			widthPt,
+			heightPt,
+			items,
+			...notes !== void 0 ? { notes } : {},
+			...annotations.length > 0 ? { annotations } : {}
+		},
+		boxRow
 	};
 }
 function withStructure(item, structure) {

package/dist/read.js

@@ -57,7 +57,9 @@ function readPdf(bytes, options) {
 	const pageBoxRows = [];
 	const pages = pageDicts.map((pageDict, index) => {
 		throwIfAborted(signal);
-		return readPage(index, pageDict, doc, fontResolver, images, imageIdCache, destinationRegistry, optionalContent.layerNameOf, structure.ownerOf, pageBoxRows, sink);
+		const read = readPage(index, pageDict, doc, fontResolver, images, imageIdCache, destinationRegistry, optionalContent.layerNameOf, structure.ownerOf, sink);
+		if (read.boxRow !== void 0) pageBoxRows.push(read.boxRow);
+		return read.page;
 	});
 	if (pageBoxRows.length > 0) source["page-boxes"] = {
 		format: "pdf",
@@ -274,7 +276,7 @@ function pageBoxResidueEntry(pageIndex, page, mediaBox, cropBox) {
 	for (const [key, value] of declaredBoxes) if (value !== void 0) entries[key] = value;
 	return pdfDict(entries);
 }
-function readPage(pageIndex, page, resolver, fontResolver, images, imageIdCache, destinationRegistry, layerNameOf, structureOwnerOf, pageBoxRows, sink) {
+function readPage(pageIndex, page, resolver, fontResolver, images, imageIdCache, destinationRegistry, layerNameOf, structureOwnerOf, sink) {
 	const resources = resolver.resolveDict(dictGet(page, "Resources"));
 	const mediaBox = readMediaBox(page);
 	let cropBox = readDeclaredPageBox(page, "CropBox") ?? mediaBox;
@@ -293,7 +295,6 @@ function readPage(pageIndex, page, resolver, fontResolver, images, imageIdCache,
 	const heightPt = visibleRect.maxY - visibleRect.minY;
 	const pageMatrix = multiplyMatrices(rotationResult.matrix, translationMatrix(-visibleRect.minX, -visibleRect.minY));
 	const boxRow = pageBoxResidueEntry(pageIndex, page, mediaBox, cropBox);
-	if (boxRow !== void 0) pageBoxRows.push(boxRow);
 	const items = [];
 	if (resources !== void 0) {
 		const contentBytes = readPageContentBytes(page, resolver, sink);
@@ -318,11 +319,14 @@ function readPage(pageIndex, page, resolver, fontResolver, images, imageIdCache,
 	const notes = readPageNotes(page, resolver);
 	const annotations = readPageAnnotations(page, pageMatrix, resolver, sink);
 	return {
-		widthPt,
-		heightPt,
-		items,
-		...notes !== void 0 ? { notes } : {},
-		...annotations.length > 0 ? { annotations } : {}
+		page: {
+			widthPt,
+			heightPt,
+			items,
+			...notes !== void 0 ? { notes } : {},
+			...annotations.length > 0 ? { annotations } : {}
+		},
+		boxRow
 	};
 }
 function withStructure(item, structure) {

package/dist/serialize.d.cts

@@ -1,4 +1,4 @@
-import { r as PdfObject } from "./objects-B7HdMeWS.cjs";
+import { r as PdfObject } from "./objects-e2RS3-yT.cjs";
 import { ByteWriter } from "./bytes/writer.cjs";
 //#region src/serialize.d.ts
 declare function formatNumber(n: number): string;

package/dist/serialize.d.ts

@@ -1,4 +1,4 @@
-import { r as PdfObject } from "./objects-B7HdMeWS.js";
+import { r as PdfObject } from "./objects-e2RS3-yT.js";
 import { ByteWriter } from "./bytes/writer.js";
 //#region src/serialize.d.ts
 declare function formatNumber(n: number): string;

package/dist/sfnt-subset.d.cts

@@ -6,6 +6,6 @@ interface SfntSubsetResult {
   readonly glyphIds: readonly number[];
   readonly unmappedCodePoints: readonly number[];
 }
-declare function subsetSfnt(font: SfntFont, codePoints: Iterable<number>, extraGlyphIds?: Iterable<number>): SfntSubsetResult | undefined;
+declare function subsetSfnt(font: SfntFont, codePoints: Readonly<Iterable<number>>, extraGlyphIds?: Readonly<Iterable<number>>): SfntSubsetResult | undefined;
 //#endregion
 export { SfntSubsetResult, subsetSfnt };

package/dist/sfnt-subset.d.ts

@@ -6,6 +6,6 @@ interface SfntSubsetResult {
   readonly glyphIds: readonly number[];
   readonly unmappedCodePoints: readonly number[];
 }
-declare function subsetSfnt(font: SfntFont, codePoints: Iterable<number>, extraGlyphIds?: Iterable<number>): SfntSubsetResult | undefined;
+declare function subsetSfnt(font: SfntFont, codePoints: Readonly<Iterable<number>>, extraGlyphIds?: Readonly<Iterable<number>>): SfntSubsetResult | undefined;
 //#endregion
 export { SfntSubsetResult, subsetSfnt };

package/dist/structure.cjs

@@ -2,6 +2,10 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_objects = require("./objects.cjs");
 const require_pdf_text = require("./pdf-text.cjs");
 //#region src/structure.ts
+const NEVER_DICT = {
+	kind: "dict",
+	entries: /* @__PURE__ */ new Map()
+};
 function readStructure(catalog, pages, resolver, sink) {
 	const root = resolver.resolveDict(require_objects.dictGet(catalog, "StructTreeRoot"));
 	if (root === void 0) return {
@@ -176,9 +180,5 @@ function parentTreeOwners(root, pages, resolver, idByDict, sink) {
 	});
 	return (pageIndex, mcid) => owners.get(`${pageIndex}:${mcid}`);
 }
-const NEVER_DICT = {
-	kind: "dict",
-	entries: /* @__PURE__ */ new Map()
-};
 //#endregion
 exports.readStructure = readStructure;

package/dist/structure.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";
 import { LayoutStructureElement } from "./layout.cjs";
 //#region src/structure.d.ts
@@ -7,6 +7,6 @@ interface StructureContext {
   readonly tree: readonly LayoutStructureElement[];
   readonly ownerOf: (pageIndex: number, mcid: number) => string | undefined;
 }
-declare function readStructure(catalog: PdfDict, pages: readonly PdfDict[], resolver: PdfObjectResolver, sink: PdfDiagnosticSink): StructureContext;
+declare function readStructure(catalog: PdfDict, pages: readonly PdfDict[], resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): StructureContext;
 //#endregion
 export { StructureContext, readStructure };

package/dist/structure.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";
 import { LayoutStructureElement } from "./layout.js";
 //#region src/structure.d.ts
@@ -7,6 +7,6 @@ interface StructureContext {
   readonly tree: readonly LayoutStructureElement[];
   readonly ownerOf: (pageIndex: number, mcid: number) => string | undefined;
 }
-declare function readStructure(catalog: PdfDict, pages: readonly PdfDict[], resolver: PdfObjectResolver, sink: PdfDiagnosticSink): StructureContext;
+declare function readStructure(catalog: PdfDict, pages: readonly PdfDict[], resolver: Readonly<PdfObjectResolver>, sink: PdfDiagnosticSink): StructureContext;
 //#endregion
 export { StructureContext, readStructure };

package/dist/structure.js

@@ -1,6 +1,10 @@
 import { asArray, asName, asNumber, dictGet } from "./objects.js";
 import { decodePdfString } from "./pdf-text.js";
 //#region src/structure.ts
+const NEVER_DICT = {
+	kind: "dict",
+	entries: /* @__PURE__ */ new Map()
+};
 function readStructure(catalog, pages, resolver, sink) {
 	const root = resolver.resolveDict(dictGet(catalog, "StructTreeRoot"));
 	if (root === void 0) return {
@@ -175,9 +179,5 @@ function parentTreeOwners(root, pages, resolver, idByDict, sink) {
 	});
 	return (pageIndex, mcid) => owners.get(`${pageIndex}:${mcid}`);
 }
-const NEVER_DICT = {
-	kind: "dict",
-	entries: /* @__PURE__ */ new Map()
-};
 //#endregion
 export { readStructure };

package/dist/text-layout.d.cts

@@ -1,6 +1,6 @@
 import { Color, LayoutFont, StyledRun, TextMeasurer, WrapOptions, WrappedLine } from "document-schema.js";
 //#region src/text-layout.d.ts
 declare function wrapRunsToWidth(runs: readonly StyledRun[], measurer: TextMeasurer, maxWidthPt: number, options?: WrapOptions): WrappedLine[];
-declare function wrapTextToWidth(text: string, font: LayoutFont, sizePt: number, color: Color, measurer: TextMeasurer, maxWidthPt: number): string[];
+declare function wrapTextToWidth(text: string, font: Readonly<LayoutFont>, sizePt: number, color: Readonly<Color>, measurer: TextMeasurer, maxWidthPt: number): string[];
 //#endregion
 export { wrapRunsToWidth, wrapTextToWidth };

package/dist/text-layout.d.ts

@@ -1,6 +1,6 @@
 import { Color, LayoutFont, StyledRun, TextMeasurer, WrapOptions, WrappedLine } from "document-schema.js";
 //#region src/text-layout.d.ts
 declare function wrapRunsToWidth(runs: readonly StyledRun[], measurer: TextMeasurer, maxWidthPt: number, options?: WrapOptions): WrappedLine[];
-declare function wrapTextToWidth(text: string, font: LayoutFont, sizePt: number, color: Color, measurer: TextMeasurer, maxWidthPt: number): string[];
+declare function wrapTextToWidth(text: string, font: Readonly<LayoutFont>, sizePt: number, color: Readonly<Color>, measurer: TextMeasurer, maxWidthPt: number): string[];
 //#endregion
 export { wrapRunsToWidth, wrapTextToWidth };

package/dist/tounicode.d.cts

@@ -1,4 +1,4 @@
-import { r as PdfObject } from "./objects-B7HdMeWS.cjs";
+import { r as PdfObject } from "./objects-e2RS3-yT.cjs";
 //#region src/tounicode.d.ts
 declare function buildToUnicodeCMap(codeToSequence: ReadonlyMap<number, readonly number[]>): PdfObject;
 //#endregion

package/dist/tounicode.d.ts

@@ -1,4 +1,4 @@
-import { r as PdfObject } from "./objects-B7HdMeWS.js";
+import { r as PdfObject } from "./objects-e2RS3-yT.js";
 //#region src/tounicode.d.ts
 declare function buildToUnicodeCMap(codeToSequence: ReadonlyMap<number, readonly number[]>): PdfObject;
 //#endregion

package/dist/winansi.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_afm_widths = require("./afm-widths-BTu0IDp2.cjs");
+const require_afm_widths = require("./afm-widths-BYiX2L9D.cjs");
 exports.encodeForShow = require_afm_widths.encodeForShow;
 exports.sanitizeToWinAnsi = require_afm_widths.sanitizeToWinAnsi;
 exports.winAnsiCodeToUnicode = require_afm_widths.winAnsiCodeToUnicode;