pdf-parser.js 5.2.15 → 5.2.17

package/dist/cff.cjs

@@ -32,7 +32,6 @@ const REAL_NIBBLE_DECIMAL_POINT = 10;
 const REAL_NIBBLE_EXPONENT = 11;
 const REAL_NIBBLE_NEGATIVE_EXPONENT = 12;
 const REAL_NIBBLE_RESERVED = 13;
-const REAL_NIBBLE_MINUS = 14;
 const REAL_NIBBLE_TERMINATOR = 15;
 const NIBBLES_PER_BYTE = 2;
 const HIGH_NIBBLE_SHIFT = 4;
@@ -85,7 +84,7 @@ function readRealOperand(data, start) {
 			else if (nibble === REAL_NIBBLE_DECIMAL_POINT) text += ".";
 			else if (nibble === REAL_NIBBLE_EXPONENT) text += "E";
 			else if (nibble === REAL_NIBBLE_NEGATIVE_EXPONENT) text += "E-";
-			else if (nibble === REAL_NIBBLE_MINUS) text += "-";
+			else text += "-";
 		}
 	}
 }

package/dist/cff.js

@@ -31,7 +31,6 @@ const REAL_NIBBLE_DECIMAL_POINT = 10;
 const REAL_NIBBLE_EXPONENT = 11;
 const REAL_NIBBLE_NEGATIVE_EXPONENT = 12;
 const REAL_NIBBLE_RESERVED = 13;
-const REAL_NIBBLE_MINUS = 14;
 const REAL_NIBBLE_TERMINATOR = 15;
 const NIBBLES_PER_BYTE = 2;
 const HIGH_NIBBLE_SHIFT = 4;
@@ -84,7 +83,7 @@ function readRealOperand(data, start) {
 			else if (nibble === REAL_NIBBLE_DECIMAL_POINT) text += ".";
 			else if (nibble === REAL_NIBBLE_EXPONENT) text += "E";
 			else if (nibble === REAL_NIBBLE_NEGATIVE_EXPONENT) text += "E-";
-			else if (nibble === REAL_NIBBLE_MINUS) text += "-";
+			else text += "-";
 		}
 	}
 }

package/dist/write.cjs

@@ -40,10 +40,12 @@ function textToPdfString(text) {
 	const bytes = new Uint8Array(2 + text.length * 2);
 	bytes[0] = 254;
 	bytes[1] = 255;
-	for (let i = 0; i < text.length; i++) {
-		const code = text.charCodeAt(i);
-		bytes[2 + i * 2] = code >> 8 & 255;
-		bytes[2 + i * 2 + 1] = code & 255;
+	let offset = 2;
+	for (const unit of text.split("")) {
+		const code = unit.charCodeAt(0);
+		bytes[offset] = code >> 8 & 255;
+		bytes[offset + 1] = code & 255;
+		offset += 2;
 	}
 	return require_objects.pdfHexString(bytes);
 }
@@ -103,6 +105,9 @@ function buildFontObjects(standardName, descriptorRef) {
 		})
 	};
 }
+function codePointsOf(texts) {
+	return new Set(texts.flatMap((text) => [...text].map((character) => character.codePointAt(0))));
+}
 function prepareJpegImage(bytes) {
 	const info = require_image_jpeg_info.readJpegInfo(bytes);
 	const colorSpace = info.components === 1 ? "DeviceGray" : info.components === 4 ? "DeviceCMYK" : "DeviceRGB";
@@ -145,12 +150,14 @@ function pngImageDict(width, height, colorSpace, compress) {
 function packBilevel(raw) {
 	const rowBytes = raw.width + 7 >> 3;
 	const packed = new Uint8Array(rowBytes * raw.height);
-	for (let y = 0; y < raw.height; y++) for (let x = 0; x < raw.width; x++) {
-		const sample = raw.data[y * raw.width + x] ?? 0;
+	const view = new DataView(packed.buffer);
+	for (let index = 0; index < raw.data.length; index++) {
+		const sample = raw.data[index];
 		if (sample !== 0 && sample !== 255) return;
 		if (sample === 255) {
-			const index = y * rowBytes + (x >> 3);
-			packed[index] = (packed[index] ?? 0) | 128 >> (x & 7);
+			const x = index % raw.width;
+			const byteIndex = Math.floor(index / raw.width) * rowBytes + (x >> 3);
+			view.setUint8(byteIndex, view.getUint8(byteIndex) | 128 >> (x & 7));
 		}
 	}
 	return packed;
@@ -202,28 +209,27 @@ function preparePngImage(bytes, compress) {
 		}
 	};
 }
-function preparePassthroughImage(asset, compress) {
-	if (asset.original === void 0) throw new Error("preparePassthroughImage: asset carries no original stream");
+function preparePassthroughImage(asset, original, compress) {
 	const png = preparePngImage((0, byte_codec.base64ToBytes)(asset.base64), compress);
 	const entries = /* @__PURE__ */ new Map([
 		["Type", require_objects.pdfName("XObject")],
 		["Subtype", require_objects.pdfName("Image")],
 		["Width", require_objects.pdfNum(asset.widthPx)],
 		["Height", require_objects.pdfNum(asset.heightPx)],
-		["Filter", require_objects.pdfName(asset.original.filter === "jbig2" ? "JBIG2Decode" : "JPXDecode")]
+		["Filter", require_objects.pdfName(original.filter === "jbig2" ? "JBIG2Decode" : "JPXDecode")]
 	]);
-	if (asset.original.filter === "jbig2") {
+	if (original.filter === "jbig2") {
 		entries.set("ColorSpace", require_objects.pdfName("DeviceGray"));
 		entries.set("BitsPerComponent", require_objects.pdfNum(1));
 	}
 	return {
 		dict: require_objects.pdfDict(entries),
-		raw: (0, byte_codec.base64ToBytes)(asset.original.base64),
-		...png.alpha !== void 0 ? { alpha: png.alpha } : {}
+		raw: (0, byte_codec.base64ToBytes)(original.base64),
+		alpha: png.alpha
 	};
 }
 function prepareImage(asset, compress) {
-	if (asset.original !== void 0) return preparePassthroughImage(asset, compress);
+	if (asset.original !== void 0) return preparePassthroughImage(asset, asset.original, compress);
 	const bytes = (0, byte_codec.base64ToBytes)(asset.base64);
 	return asset.format === "jpeg" ? prepareJpegImage(bytes) : preparePngImage(bytes, compress);
 }
@@ -322,7 +328,7 @@ function xrefEntry(offset, generation, inUse) {
 }
 function parseResidueRow(residue) {
 	const reader = new require_bytes_reader.ByteReader(new TextEncoder().encode(residue.xml));
-	return require_parse.parseValue(reader, () => {});
+	return require_parse.parseValue(reader, () => void 0);
 }
 function objectContainsReference(obj) {
 	if (obj.kind === "ref") return true;
@@ -352,13 +358,9 @@ function writePdf(doc, options = {}) {
 	for (const page of doc.pages) for (const item of page.items) if (item.kind === "text") {
 		const resolved = require_font_registry.resolveFaceWithRegistry(registry, item.font);
 		if (resolved.kind === "embedded") {
-			const use = embeddedUses.get(resolved.face) ?? {
-				texts: [],
-				codePoints: /* @__PURE__ */ new Set()
-			};
-			use.texts.push(item.text);
-			for (const character of item.text) use.codePoints.add(character.codePointAt(0));
-			embeddedUses.set(resolved.face, use);
+			const texts = embeddedUses.get(resolved.face) ?? [];
+			texts.push(item.text);
+			embeddedUses.set(resolved.face, texts);
 		} else fontNames.add(resolved.standardName);
 	} else if (item.kind === "image") imageIds.add(item.imageId);
 	const fontAllocs = /* @__PURE__ */ new Map();
@@ -400,15 +402,15 @@ function writePdf(doc, options = {}) {
 	};
 	const embeddedAllocs = /* @__PURE__ */ new Map();
 	const sortedEmbeddedUses = [...embeddedUses.entries()].sort(([a], [b]) => a.postScriptName < b.postScriptName ? -1 : a.postScriptName > b.postScriptName ? 1 : 0);
-	for (const [index, [face, use]] of sortedEmbeddedUses.entries()) embeddedAllocs.set(face, {
+	for (const [index, [face, texts]] of sortedEmbeddedUses.entries()) embeddedAllocs.set(face, {
 		type0Num: nextObjNum++,
 		cidFontNum: nextObjNum++,
 		descriptorNum: nextObjNum++,
 		fontFileNum: nextObjNum++,
 		toUnicodeNum: nextObjNum++,
 		resourceName: `${EMBEDDED_FONT_RESOURCE_PREFIX}${index + 1}`,
-		texts: use.texts,
-		codePoints: use.codePoints
+		texts,
+		codePoints: codePointsOf(texts)
 	});
 	const pageAllocs = doc.pages.map(() => ({
 		pageNum: nextObjNum++,
@@ -422,14 +424,12 @@ function writePdf(doc, options = {}) {
 	const attachmentsNamesNum = attachmentAllocs.length > 0 ? nextObjNum++ : void 0;
 	const outlineRootNum = (doc.outline ?? []).length > 0 ? nextObjNum++ : void 0;
 	const outlineItemNums = [];
-	if (outlineRootNum !== void 0) {
-		const countItems = (items) => {
-			let n = 0;
-			for (const item of items) n += 1 + countItems(item.children);
-			return n;
-		};
-		for (let i = 0; i < countItems(doc.outline ?? []); i += 1) outlineItemNums.push(nextObjNum++);
-	}
+	const countItems = (items) => {
+		let n = 0;
+		for (const item of items) n += 1 + countItems(item.children);
+		return n;
+	};
+	for (let i = 0; i < countItems(doc.outline ?? []); i += 1) outlineItemNums.push(nextObjNum++);
 	const layerNumByName = /* @__PURE__ */ new Map();
 	for (const layer of doc.layers ?? []) layerNumByName.set(layer.name, nextObjNum++);
 	const formObjectNums = [];
@@ -456,17 +456,15 @@ function writePdf(doc, options = {}) {
 		return num;
 	};
 	const structElementNumById = /* @__PURE__ */ new Map();
-	const countElements = (elements) => {
-		let n = 0;
+	const allocateStructureElements = (elements) => {
 		for (const element of elements) {
 			structElementNumById.set(element.id, nextObjNum++);
-			n += 1 + countElements(element.children);
+			allocateStructureElements(element.children);
 		}
-		return n;
 	};
-	const structElementCount = countElements(doc.structure ?? []);
-	const structRootNum = structElementCount > 0 ? nextObjNum++ : void 0;
-	const structParentTreeNum = structElementCount > 0 ? nextObjNum++ : void 0;
+	allocateStructureElements(doc.structure ?? []);
+	const structRootNum = structElementNumById.size > 0 ? nextObjNum++ : void 0;
+	const structParentTreeNum = structElementNumById.size > 0 ? nextObjNum++ : void 0;
 	const residueXmpNum = doc.source?.xmp !== void 0 ? nextObjNum++ : void 0;
 	const objects = [];
 	const catalogEntries = [["Type", require_objects.pdfName("Catalog")], ["Pages", require_objects.pdfRef(pagesNum, 0)]];
@@ -550,7 +548,7 @@ function writePdf(doc, options = {}) {
 			value: require_objects.pdfDict({ EmbeddedFiles: require_objects.pdfDict({ Names: require_objects.pdfArray(names) }) })
 		});
 	}
-	if (outlineRootNum !== void 0 && (doc.outline ?? []).length > 0) {
+	if (outlineRootNum !== void 0) {
 		let itemCursor = 0;
 		const emitItems = (items, parentNum) => {
 			const siblingNums = [];
@@ -625,7 +623,7 @@ function writePdf(doc, options = {}) {
 	};
 	const emitFormFieldObjects = (fields, parentName) => {
 		for (const field of fields) {
-			const ownName = parentName.length > 0 && field.name.startsWith(`${parentName}.`) ? field.name.slice(parentName.length + 1) : field.name;
+			const ownName = parentName === void 0 ? field.name : field.name.startsWith(`${parentName}.`) ? field.name.slice(parentName.length + 1) : field.name;
 			const entries = [];
 			if (ownName.length > 0) entries.push(["T", require_objects.pdfLiteralString(new TextEncoder().encode(ownName))]);
 			if (field.alias !== void 0) entries.push(["TU", require_objects.pdfLiteralString(new TextEncoder().encode(field.alias))]);
@@ -644,7 +642,7 @@ function writePdf(doc, options = {}) {
 				if (flags !== 0) entries.push(["Ff", require_objects.pdfNum(flags)]);
 				if (field.fieldType === "text" || field.fieldType === "listbox" || field.fieldType === "combobox") {
 					if (field.value !== void 0) entries.push(["V", require_objects.pdfLiteralString(new TextEncoder().encode(field.value))]);
-				} else if (field.fieldType === "checkbox" || field.fieldType === "radio") entries.push(["V", require_objects.pdfName(field.checked === false || field.value === void 0 ? field.value ?? (field.checked === true ? "Yes" : "Off") : field.value)]);
+				} else if (field.fieldType === "checkbox" || field.fieldType === "radio") entries.push(["V", require_objects.pdfName(field.value ?? (field.checked === true ? "Yes" : "Off"))]);
 				if (field.options !== void 0) entries.push(["Opt", require_objects.pdfArray(field.options.map((option) => require_objects.pdfLiteralString(new TextEncoder().encode(option))))]);
 				const firstWidget = field.widgets[0];
 				if (field.widgets.length === 1 && firstWidget !== void 0) {
@@ -652,7 +650,7 @@ function writePdf(doc, options = {}) {
 					entries.push(["Rect", widgetRectArray(firstWidget)]);
 					entries.push(["P", require_objects.pdfRef(pageAllocs[firstWidget.pageIndex].pageNum, 0)]);
 					noteWidgetAnnot(firstWidget, require_objects.pdfRef(formNumOf(field), 0));
-				} else if (field.widgets.length > 1 && firstWidget !== void 0) {
+				} else if (formExtraWidgetNums.has(field)) {
 					const extraNums = formExtraWidgetNums.get(field) ?? [];
 					entries.push(["Kids", require_objects.pdfArray(extraNums.map((num) => require_objects.pdfRef(num, 0)))]);
 					for (const [index, num] of extraNums.entries()) {
@@ -676,8 +674,8 @@ function writePdf(doc, options = {}) {
 			emitFormFieldObjects(field.children, field.name);
 		}
 	};
-	emitFormFieldObjects(doc.form ?? [], "");
-	if (structRootNum !== void 0 && structParentTreeNum !== void 0) {
+	emitFormFieldObjects(doc.form ?? [], void 0);
+	if (structRootNum !== void 0) {
 		const emitStructureElement = (element, parentNum) => {
 			const entries = [
 				["Type", require_objects.pdfName("StructElem")],
@@ -774,7 +772,7 @@ function writePdf(doc, options = {}) {
 	}
 	for (const [face, alloc] of embeddedAllocs) {
 		const usedGlyphs = require_embedded_font.collectEmbeddedGlyphs(alloc.texts, face);
-		const subset = require_sfnt_subset.subsetSfnt(face.font, [...alloc.codePoints].sort((a, b) => a - b), [...usedGlyphs.keys()].sort((a, b) => a - b));
+		const subset = require_sfnt_subset.subsetSfnt(face.font, [...alloc.codePoints], [...usedGlyphs.keys()]);
 		if (subset === void 0) throw new Error(`font "${face.postScriptName}" resolved to an embeddable face, but its glyph outlines could not be subsetted — only TrueType-outline ('glyf') fonts can be embedded, so supply a TrueType face for this family or drop it from the registry`);
 		const built = require_embedded_font_write.buildEmbeddedFontObjects(face, subset, usedGlyphs, {
 			cidFontRef: require_objects.pdfRef(alloc.cidFontNum, 0),
@@ -887,7 +885,7 @@ function writePdf(doc, options = {}) {
 			["Contents", require_objects.pdfRef(contentsNum, 0)]
 		]);
 		if (annots.length > 0) pageEntries.set("Annots", require_objects.pdfArray(annots));
-		if ((markedStructureByPage.get(pageIndex) ?? []).length > 0) pageEntries.set("StructParents", require_objects.pdfNum(pageIndex));
+		if (markedStructureByPage.has(pageIndex)) pageEntries.set("StructParents", require_objects.pdfNum(pageIndex));
 		objects.push({
 			num: pageNum,
 			value: require_objects.pdfDict(pageEntries)
@@ -897,11 +895,11 @@ function writePdf(doc, options = {}) {
 		const nums = [];
 		for (const [pageIndex, marks] of markedStructureByPage) {
 			const maxMcid = Math.max(...marks.map((mark) => mark.mcid));
-			const byMcid = Array.from({ length: maxMcid + 1 }, () => require_objects.pdfNull());
-			for (const mark of marks) {
-				const elementNum = structElementNumById.get(mark.structureId);
-				if (elementNum !== void 0) byMcid[mark.mcid] = require_objects.pdfRef(elementNum, 0);
-			}
+			const byMcid = Array.from({ length: maxMcid + 1 }, (_, mcid) => {
+				const mark = marks.find((candidate) => candidate.mcid === mcid);
+				const elementNum = mark === void 0 ? void 0 : structElementNumById.get(mark.structureId);
+				return elementNum === void 0 ? require_objects.pdfNull() : require_objects.pdfRef(elementNum, 0);
+			});
 			nums.push(require_objects.pdfNum(pageIndex), require_objects.pdfArray(byMcid));
 		}
 		objects.push({

package/dist/write.js

@@ -39,10 +39,12 @@ function textToPdfString(text) {
 	const bytes = new Uint8Array(2 + text.length * 2);
 	bytes[0] = 254;
 	bytes[1] = 255;
-	for (let i = 0; i < text.length; i++) {
-		const code = text.charCodeAt(i);
-		bytes[2 + i * 2] = code >> 8 & 255;
-		bytes[2 + i * 2 + 1] = code & 255;
+	let offset = 2;
+	for (const unit of text.split("")) {
+		const code = unit.charCodeAt(0);
+		bytes[offset] = code >> 8 & 255;
+		bytes[offset + 1] = code & 255;
+		offset += 2;
 	}
 	return pdfHexString(bytes);
 }
@@ -102,6 +104,9 @@ function buildFontObjects(standardName, descriptorRef) {
 		})
 	};
 }
+function codePointsOf(texts) {
+	return new Set(texts.flatMap((text) => [...text].map((character) => character.codePointAt(0))));
+}
 function prepareJpegImage(bytes) {
 	const info = readJpegInfo$1(bytes);
 	const colorSpace = info.components === 1 ? "DeviceGray" : info.components === 4 ? "DeviceCMYK" : "DeviceRGB";
@@ -144,12 +149,14 @@ function pngImageDict(width, height, colorSpace, compress) {
 function packBilevel(raw) {
 	const rowBytes = raw.width + 7 >> 3;
 	const packed = new Uint8Array(rowBytes * raw.height);
-	for (let y = 0; y < raw.height; y++) for (let x = 0; x < raw.width; x++) {
-		const sample = raw.data[y * raw.width + x] ?? 0;
+	const view = new DataView(packed.buffer);
+	for (let index = 0; index < raw.data.length; index++) {
+		const sample = raw.data[index];
 		if (sample !== 0 && sample !== 255) return;
 		if (sample === 255) {
-			const index = y * rowBytes + (x >> 3);
-			packed[index] = (packed[index] ?? 0) | 128 >> (x & 7);
+			const x = index % raw.width;
+			const byteIndex = Math.floor(index / raw.width) * rowBytes + (x >> 3);
+			view.setUint8(byteIndex, view.getUint8(byteIndex) | 128 >> (x & 7));
 		}
 	}
 	return packed;
@@ -201,28 +208,27 @@ function preparePngImage(bytes, compress) {
 		}
 	};
 }
-function preparePassthroughImage(asset, compress) {
-	if (asset.original === void 0) throw new Error("preparePassthroughImage: asset carries no original stream");
+function preparePassthroughImage(asset, original, compress) {
 	const png = preparePngImage(base64ToBytes(asset.base64), compress);
 	const entries = /* @__PURE__ */ new Map([
 		["Type", pdfName("XObject")],
 		["Subtype", pdfName("Image")],
 		["Width", pdfNum(asset.widthPx)],
 		["Height", pdfNum(asset.heightPx)],
-		["Filter", pdfName(asset.original.filter === "jbig2" ? "JBIG2Decode" : "JPXDecode")]
+		["Filter", pdfName(original.filter === "jbig2" ? "JBIG2Decode" : "JPXDecode")]
 	]);
-	if (asset.original.filter === "jbig2") {
+	if (original.filter === "jbig2") {
 		entries.set("ColorSpace", pdfName("DeviceGray"));
 		entries.set("BitsPerComponent", pdfNum(1));
 	}
 	return {
 		dict: pdfDict(entries),
-		raw: base64ToBytes(asset.original.base64),
-		...png.alpha !== void 0 ? { alpha: png.alpha } : {}
+		raw: base64ToBytes(original.base64),
+		alpha: png.alpha
 	};
 }
 function prepareImage(asset, compress) {
-	if (asset.original !== void 0) return preparePassthroughImage(asset, compress);
+	if (asset.original !== void 0) return preparePassthroughImage(asset, asset.original, compress);
 	const bytes = base64ToBytes(asset.base64);
 	return asset.format === "jpeg" ? prepareJpegImage(bytes) : preparePngImage(bytes, compress);
 }
@@ -321,7 +327,7 @@ function xrefEntry(offset, generation, inUse) {
 }
 function parseResidueRow(residue) {
 	const reader = new ByteReader(new TextEncoder().encode(residue.xml));
-	return parseValue(reader, () => {});
+	return parseValue(reader, () => void 0);
 }
 function objectContainsReference(obj) {
 	if (obj.kind === "ref") return true;
@@ -351,13 +357,9 @@ function writePdf(doc, options = {}) {
 	for (const page of doc.pages) for (const item of page.items) if (item.kind === "text") {
 		const resolved = resolveFaceWithRegistry(registry, item.font);
 		if (resolved.kind === "embedded") {
-			const use = embeddedUses.get(resolved.face) ?? {
-				texts: [],
-				codePoints: /* @__PURE__ */ new Set()
-			};
-			use.texts.push(item.text);
-			for (const character of item.text) use.codePoints.add(character.codePointAt(0));
-			embeddedUses.set(resolved.face, use);
+			const texts = embeddedUses.get(resolved.face) ?? [];
+			texts.push(item.text);
+			embeddedUses.set(resolved.face, texts);
 		} else fontNames.add(resolved.standardName);
 	} else if (item.kind === "image") imageIds.add(item.imageId);
 	const fontAllocs = /* @__PURE__ */ new Map();
@@ -399,15 +401,15 @@ function writePdf(doc, options = {}) {
 	};
 	const embeddedAllocs = /* @__PURE__ */ new Map();
 	const sortedEmbeddedUses = [...embeddedUses.entries()].sort(([a], [b]) => a.postScriptName < b.postScriptName ? -1 : a.postScriptName > b.postScriptName ? 1 : 0);
-	for (const [index, [face, use]] of sortedEmbeddedUses.entries()) embeddedAllocs.set(face, {
+	for (const [index, [face, texts]] of sortedEmbeddedUses.entries()) embeddedAllocs.set(face, {
 		type0Num: nextObjNum++,
 		cidFontNum: nextObjNum++,
 		descriptorNum: nextObjNum++,
 		fontFileNum: nextObjNum++,
 		toUnicodeNum: nextObjNum++,
 		resourceName: `${EMBEDDED_FONT_RESOURCE_PREFIX}${index + 1}`,
-		texts: use.texts,
-		codePoints: use.codePoints
+		texts,
+		codePoints: codePointsOf(texts)
 	});
 	const pageAllocs = doc.pages.map(() => ({
 		pageNum: nextObjNum++,
@@ -421,14 +423,12 @@ function writePdf(doc, options = {}) {
 	const attachmentsNamesNum = attachmentAllocs.length > 0 ? nextObjNum++ : void 0;
 	const outlineRootNum = (doc.outline ?? []).length > 0 ? nextObjNum++ : void 0;
 	const outlineItemNums = [];
-	if (outlineRootNum !== void 0) {
-		const countItems = (items) => {
-			let n = 0;
-			for (const item of items) n += 1 + countItems(item.children);
-			return n;
-		};
-		for (let i = 0; i < countItems(doc.outline ?? []); i += 1) outlineItemNums.push(nextObjNum++);
-	}
+	const countItems = (items) => {
+		let n = 0;
+		for (const item of items) n += 1 + countItems(item.children);
+		return n;
+	};
+	for (let i = 0; i < countItems(doc.outline ?? []); i += 1) outlineItemNums.push(nextObjNum++);
 	const layerNumByName = /* @__PURE__ */ new Map();
 	for (const layer of doc.layers ?? []) layerNumByName.set(layer.name, nextObjNum++);
 	const formObjectNums = [];
@@ -455,17 +455,15 @@ function writePdf(doc, options = {}) {
 		return num;
 	};
 	const structElementNumById = /* @__PURE__ */ new Map();
-	const countElements = (elements) => {
-		let n = 0;
+	const allocateStructureElements = (elements) => {
 		for (const element of elements) {
 			structElementNumById.set(element.id, nextObjNum++);
-			n += 1 + countElements(element.children);
+			allocateStructureElements(element.children);
 		}
-		return n;
 	};
-	const structElementCount = countElements(doc.structure ?? []);
-	const structRootNum = structElementCount > 0 ? nextObjNum++ : void 0;
-	const structParentTreeNum = structElementCount > 0 ? nextObjNum++ : void 0;
+	allocateStructureElements(doc.structure ?? []);
+	const structRootNum = structElementNumById.size > 0 ? nextObjNum++ : void 0;
+	const structParentTreeNum = structElementNumById.size > 0 ? nextObjNum++ : void 0;
 	const residueXmpNum = doc.source?.xmp !== void 0 ? nextObjNum++ : void 0;
 	const objects = [];
 	const catalogEntries = [["Type", pdfName("Catalog")], ["Pages", pdfRef(pagesNum, 0)]];
@@ -549,7 +547,7 @@ function writePdf(doc, options = {}) {
 			value: pdfDict({ EmbeddedFiles: pdfDict({ Names: pdfArray(names) }) })
 		});
 	}
-	if (outlineRootNum !== void 0 && (doc.outline ?? []).length > 0) {
+	if (outlineRootNum !== void 0) {
 		let itemCursor = 0;
 		const emitItems = (items, parentNum) => {
 			const siblingNums = [];
@@ -624,7 +622,7 @@ function writePdf(doc, options = {}) {
 	};
 	const emitFormFieldObjects = (fields, parentName) => {
 		for (const field of fields) {
-			const ownName = parentName.length > 0 && field.name.startsWith(`${parentName}.`) ? field.name.slice(parentName.length + 1) : field.name;
+			const ownName = parentName === void 0 ? field.name : field.name.startsWith(`${parentName}.`) ? field.name.slice(parentName.length + 1) : field.name;
 			const entries = [];
 			if (ownName.length > 0) entries.push(["T", pdfLiteralString(new TextEncoder().encode(ownName))]);
 			if (field.alias !== void 0) entries.push(["TU", pdfLiteralString(new TextEncoder().encode(field.alias))]);
@@ -643,7 +641,7 @@ function writePdf(doc, options = {}) {
 				if (flags !== 0) entries.push(["Ff", pdfNum(flags)]);
 				if (field.fieldType === "text" || field.fieldType === "listbox" || field.fieldType === "combobox") {
 					if (field.value !== void 0) entries.push(["V", pdfLiteralString(new TextEncoder().encode(field.value))]);
-				} else if (field.fieldType === "checkbox" || field.fieldType === "radio") entries.push(["V", pdfName(field.checked === false || field.value === void 0 ? field.value ?? (field.checked === true ? "Yes" : "Off") : field.value)]);
+				} else if (field.fieldType === "checkbox" || field.fieldType === "radio") entries.push(["V", pdfName(field.value ?? (field.checked === true ? "Yes" : "Off"))]);
 				if (field.options !== void 0) entries.push(["Opt", pdfArray(field.options.map((option) => pdfLiteralString(new TextEncoder().encode(option))))]);
 				const firstWidget = field.widgets[0];
 				if (field.widgets.length === 1 && firstWidget !== void 0) {
@@ -651,7 +649,7 @@ function writePdf(doc, options = {}) {
 					entries.push(["Rect", widgetRectArray(firstWidget)]);
 					entries.push(["P", pdfRef(pageAllocs[firstWidget.pageIndex].pageNum, 0)]);
 					noteWidgetAnnot(firstWidget, pdfRef(formNumOf(field), 0));
-				} else if (field.widgets.length > 1 && firstWidget !== void 0) {
+				} else if (formExtraWidgetNums.has(field)) {
 					const extraNums = formExtraWidgetNums.get(field) ?? [];
 					entries.push(["Kids", pdfArray(extraNums.map((num) => pdfRef(num, 0)))]);
 					for (const [index, num] of extraNums.entries()) {
@@ -675,8 +673,8 @@ function writePdf(doc, options = {}) {
 			emitFormFieldObjects(field.children, field.name);
 		}
 	};
-	emitFormFieldObjects(doc.form ?? [], "");
-	if (structRootNum !== void 0 && structParentTreeNum !== void 0) {
+	emitFormFieldObjects(doc.form ?? [], void 0);
+	if (structRootNum !== void 0) {
 		const emitStructureElement = (element, parentNum) => {
 			const entries = [
 				["Type", pdfName("StructElem")],
@@ -773,7 +771,7 @@ function writePdf(doc, options = {}) {
 	}
 	for (const [face, alloc] of embeddedAllocs) {
 		const usedGlyphs = collectEmbeddedGlyphs(alloc.texts, face);
-		const subset = subsetSfnt(face.font, [...alloc.codePoints].sort((a, b) => a - b), [...usedGlyphs.keys()].sort((a, b) => a - b));
+		const subset = subsetSfnt(face.font, [...alloc.codePoints], [...usedGlyphs.keys()]);
 		if (subset === void 0) throw new Error(`font "${face.postScriptName}" resolved to an embeddable face, but its glyph outlines could not be subsetted — only TrueType-outline ('glyf') fonts can be embedded, so supply a TrueType face for this family or drop it from the registry`);
 		const built = buildEmbeddedFontObjects(face, subset, usedGlyphs, {
 			cidFontRef: pdfRef(alloc.cidFontNum, 0),
@@ -886,7 +884,7 @@ function writePdf(doc, options = {}) {
 			["Contents", pdfRef(contentsNum, 0)]
 		]);
 		if (annots.length > 0) pageEntries.set("Annots", pdfArray(annots));
-		if ((markedStructureByPage.get(pageIndex) ?? []).length > 0) pageEntries.set("StructParents", pdfNum(pageIndex));
+		if (markedStructureByPage.has(pageIndex)) pageEntries.set("StructParents", pdfNum(pageIndex));
 		objects.push({
 			num: pageNum,
 			value: pdfDict(pageEntries)
@@ -896,11 +894,11 @@ function writePdf(doc, options = {}) {
 		const nums = [];
 		for (const [pageIndex, marks] of markedStructureByPage) {
 			const maxMcid = Math.max(...marks.map((mark) => mark.mcid));
-			const byMcid = Array.from({ length: maxMcid + 1 }, () => pdfNull());
-			for (const mark of marks) {
-				const elementNum = structElementNumById.get(mark.structureId);
-				if (elementNum !== void 0) byMcid[mark.mcid] = pdfRef(elementNum, 0);
-			}
+			const byMcid = Array.from({ length: maxMcid + 1 }, (_, mcid) => {
+				const mark = marks.find((candidate) => candidate.mcid === mcid);
+				const elementNum = mark === void 0 ? void 0 : structElementNumById.get(mark.structureId);
+				return elementNum === void 0 ? pdfNull() : pdfRef(elementNum, 0);
+			});
 			nums.push(pdfNum(pageIndex), pdfArray(byMcid));
 		}
 		objects.push({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdf-parser.js",
-  "version": "5.2.15",
+  "version": "5.2.17",
   "description": "Hand-written, dependency-minimal PDF codec: parses arbitrary real-world PDFs and generates new ones, built on its own codec-owned LayoutDocument item model and Zod 4 codecs.",
   "type": "module",
   "repository": {