pdf-parser.js 4.5.6 → 4.7.0

package/dist/images-read.js

@@ -248,7 +248,11 @@ function readJpeg2000Image(dict, raw, resolver, sink) {
 		format: "png",
 		bytes: encodePng(withAlpha),
 		widthPx: image.width,
-		heightPx: image.height
+		heightPx: image.height,
+		original: {
+			filter: "jpeg2000",
+			bytes: raw
+		}
 	};
 }
 function readImageXObject(dict, raw, resolver, sink) {
@@ -261,6 +265,11 @@ function readImageXObject(dict, raw, resolver, sink) {
 		return;
 	}
 	const decoded = decodeStream(raw, dict, sink, (obj) => resolver.resolve(obj));
+	const jbig2Original = decoded.jbig2 === void 0 ? void 0 : {
+		filter: "jbig2",
+		bytes: decoded.jbig2.encoded,
+		...decoded.jbig2.globals !== void 0 ? { globalsBytes: decoded.jbig2.globals } : {}
+	};
 	if (decoded.remainingFilter === "DCTDecode") {
 		let info;
 		try {
@@ -322,7 +331,8 @@ function readImageXObject(dict, raw, resolver, sink) {
 		format: "png",
 		bytes: encodePng(withAlpha),
 		widthPx: width,
-		heightPx: height
+		heightPx: height,
+		...jbig2Original !== void 0 ? { original: jbig2Original } : {}
 	};
 }
 //#endregion

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-oc65VGlr.cjs";
+import { n as EmbeddedFaceMetrics, r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-DJUn9kMH.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-B4p9a3O3.js";
+import { n as EmbeddedFaceMetrics, r as EmbeddedFaceSubstitution, t as EmbeddedFace } from "./embedded-font-BRhZfEN2.js";
 import { WinAnsiSubstitution } from "./winansi.js";
 import { PdfEncryptionError, PdfEncryptionOptions, PdfEncryptionPermissions, PdfEncryptionScheme } from "./encrypt-write.js";
 import { FontFace, FontFaceParseError, readFontFace } from "./font-face.js";

package/dist/layout.cjs

@@ -178,7 +178,12 @@ const LayoutImageAssetSchema = zod.z.object({
 	format: zod.z.enum(["png", "jpeg"]),
 	base64: zod.z.string(),
 	widthPx: zod.z.number().int().positive(),
-	heightPx: zod.z.number().int().positive()
+	heightPx: zod.z.number().int().positive(),
+	original: zod.z.object({
+		filter: zod.z.enum(["jbig2", "jpeg2000"]),
+		base64: zod.z.string(),
+		jbig2GlobalsBase64: zod.z.string().optional()
+	}).optional()
 });
 const LayoutDestinationTargetSchema = zod.z.object({
 	kind: zod.z.enum([

package/dist/layout.d.cts

@@ -675,6 +675,14 @@ declare const LayoutImageAssetSchema: z.ZodObject<{
   base64: z.ZodString;
   widthPx: z.ZodNumber;
   heightPx: z.ZodNumber;
+  original: z.ZodOptional<z.ZodObject<{
+    filter: z.ZodEnum<{
+      jbig2: "jbig2";
+      jpeg2000: "jpeg2000";
+    }>;
+    base64: z.ZodString;
+    jbig2GlobalsBase64: z.ZodOptional<z.ZodString>;
+  }, z.core.$strip>>;
 }, z.core.$strip>;
 type LayoutImageAsset = z.infer<typeof LayoutImageAssetSchema>;
 declare const LayoutDestinationTargetSchema: z.ZodObject<{
@@ -1016,6 +1024,14 @@ declare const LayoutDocumentSchema: z.ZodObject<{
     base64: z.ZodString;
     widthPx: z.ZodNumber;
     heightPx: z.ZodNumber;
+    original: z.ZodOptional<z.ZodObject<{
+      filter: z.ZodEnum<{
+        jbig2: "jbig2";
+        jpeg2000: "jpeg2000";
+      }>;
+      base64: z.ZodString;
+      jbig2GlobalsBase64: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>;
   }, z.core.$strip>>;
   destinations: z.ZodOptional<z.ZodArray<z.ZodObject<{
     name: z.ZodString;

package/dist/layout.d.ts

@@ -675,6 +675,14 @@ declare const LayoutImageAssetSchema: z.ZodObject<{
   base64: z.ZodString;
   widthPx: z.ZodNumber;
   heightPx: z.ZodNumber;
+  original: z.ZodOptional<z.ZodObject<{
+    filter: z.ZodEnum<{
+      jbig2: "jbig2";
+      jpeg2000: "jpeg2000";
+    }>;
+    base64: z.ZodString;
+    jbig2GlobalsBase64: z.ZodOptional<z.ZodString>;
+  }, z.core.$strip>>;
 }, z.core.$strip>;
 type LayoutImageAsset = z.infer<typeof LayoutImageAssetSchema>;
 declare const LayoutDestinationTargetSchema: z.ZodObject<{
@@ -1016,6 +1024,14 @@ declare const LayoutDocumentSchema: z.ZodObject<{
     base64: z.ZodString;
     widthPx: z.ZodNumber;
     heightPx: z.ZodNumber;
+    original: z.ZodOptional<z.ZodObject<{
+      filter: z.ZodEnum<{
+        jbig2: "jbig2";
+        jpeg2000: "jpeg2000";
+      }>;
+      base64: z.ZodString;
+      jbig2GlobalsBase64: z.ZodOptional<z.ZodString>;
+    }, z.core.$strip>>;
   }, z.core.$strip>>;
   destinations: z.ZodOptional<z.ZodArray<z.ZodObject<{
     name: z.ZodString;

package/dist/layout.js

@@ -177,7 +177,12 @@ const LayoutImageAssetSchema = z.object({
 	format: z.enum(["png", "jpeg"]),
 	base64: z.string(),
 	widthPx: z.number().int().positive(),
-	heightPx: z.number().int().positive()
+	heightPx: z.number().int().positive(),
+	original: z.object({
+		filter: z.enum(["jbig2", "jpeg2000"]),
+		base64: z.string(),
+		jbig2GlobalsBase64: z.string().optional()
+	}).optional()
 });
 const LayoutDestinationTargetSchema = z.object({
 	kind: z.enum([

package/dist/read.cjs

@@ -497,13 +497,18 @@ function imagePlacementFrom(matrix) {
 		rotationDeg: rotationDeg !== 0 ? rotationDeg : void 0
 	};
 }
-function registerExtractedImage(format, bytes, widthPx, heightPx, images) {
+function registerExtractedImage(format, bytes, widthPx, heightPx, images, original) {
 	const imageId = `img${require_bytes_crc32.crc32(bytes).toString(16)}`;
 	if (!(imageId in images)) images[imageId] = {
 		format,
 		base64: require_util_base64.bytesToBase64(bytes),
 		widthPx,
-		heightPx
+		heightPx,
+		...original !== void 0 ? { original: {
+			filter: original.filter,
+			base64: require_util_base64.bytesToBase64(original.bytes),
+			...original.globalsBytes !== void 0 ? { jbig2GlobalsBase64: require_util_base64.bytesToBase64(original.globalsBytes) } : {}
+		} } : {}
 	};
 	return imageId;
 }
@@ -514,7 +519,7 @@ function resolveCachedImageId(dict, raw, images, cache, resolver, sink) {
 		cache.set(dict, null);
 		return;
 	}
-	const imageId = registerExtractedImage(decoded.format, decoded.bytes, decoded.widthPx, decoded.heightPx, images);
+	const imageId = registerExtractedImage(decoded.format, decoded.bytes, decoded.widthPx, decoded.heightPx, images, decoded.original);
 	cache.set(dict, imageId);
 	return imageId;
 }
@@ -536,7 +541,7 @@ function convertInlineImage(item, pageMatrix, images, resolver, sink) {
 	if (decoded === void 0) return;
 	return {
 		kind: "image",
-		imageId: registerExtractedImage(decoded.format, decoded.bytes, decoded.widthPx, decoded.heightPx, images),
+		imageId: registerExtractedImage(decoded.format, decoded.bytes, decoded.widthPx, decoded.heightPx, images, decoded.original),
 		...imagePlacementFrom(require_matrix.multiplyMatrices(item.matrix, pageMatrix)),
 		...item.layerName !== void 0 ? { layer: item.layerName } : {}
 	};

package/dist/read.js

@@ -496,13 +496,18 @@ function imagePlacementFrom(matrix) {
 		rotationDeg: rotationDeg !== 0 ? rotationDeg : void 0
 	};
 }
-function registerExtractedImage(format, bytes, widthPx, heightPx, images) {
+function registerExtractedImage(format, bytes, widthPx, heightPx, images, original) {
 	const imageId = `img${crc32(bytes).toString(16)}`;
 	if (!(imageId in images)) images[imageId] = {
 		format,
 		base64: bytesToBase64(bytes),
 		widthPx,
-		heightPx
+		heightPx,
+		...original !== void 0 ? { original: {
+			filter: original.filter,
+			base64: bytesToBase64(original.bytes),
+			...original.globalsBytes !== void 0 ? { jbig2GlobalsBase64: bytesToBase64(original.globalsBytes) } : {}
+		} } : {}
 	};
 	return imageId;
 }
@@ -513,7 +518,7 @@ function resolveCachedImageId(dict, raw, images, cache, resolver, sink) {
 		cache.set(dict, null);
 		return;
 	}
-	const imageId = registerExtractedImage(decoded.format, decoded.bytes, decoded.widthPx, decoded.heightPx, images);
+	const imageId = registerExtractedImage(decoded.format, decoded.bytes, decoded.widthPx, decoded.heightPx, images, decoded.original);
 	cache.set(dict, imageId);
 	return imageId;
 }
@@ -535,7 +540,7 @@ function convertInlineImage(item, pageMatrix, images, resolver, sink) {
 	if (decoded === void 0) return;
 	return {
 		kind: "image",
-		imageId: registerExtractedImage(decoded.format, decoded.bytes, decoded.widthPx, decoded.heightPx, images),
+		imageId: registerExtractedImage(decoded.format, decoded.bytes, decoded.widthPx, decoded.heightPx, images, decoded.original),
 		...imagePlacementFrom(multiplyMatrices(item.matrix, pageMatrix)),
 		...item.layerName !== void 0 ? { layer: item.layerName } : {}
 	};

package/dist/tounicode.cjs

@@ -14,7 +14,7 @@ function sequenceToUtf16BEHex(codePoints) {
 	return hex;
 }
 function buildToUnicodeCMap(codeToSequence) {
-	const entries = [...codeToSequence].sort((a, b) => a[0] - b[0]);
+	const entries = [...codeToSequence].filter(([, sequence]) => sequence.length > 0).sort((a, b) => a[0] - b[0]);
 	const lines = [
 		"/CIDInit /ProcSet findresource begin",
 		"12 dict begin",

package/dist/tounicode.js

@@ -13,7 +13,7 @@ function sequenceToUtf16BEHex(codePoints) {
 	return hex;
 }
 function buildToUnicodeCMap(codeToSequence) {
-	const entries = [...codeToSequence].sort((a, b) => a[0] - b[0]);
+	const entries = [...codeToSequence].filter(([, sequence]) => sequence.length > 0).sort((a, b) => a[0] - b[0]);
 	const lines = [
 		"/CIDInit /ProcSet findresource begin",
 		"12 dict begin",

package/dist/write.cjs

@@ -206,7 +206,28 @@ function preparePngImage(bytes, compress) {
 		}
 	};
 }
+function preparePassthroughImage(asset, compress) {
+	if (asset.original === void 0) throw new Error("preparePassthroughImage: asset carries no original stream");
+	const png = preparePngImage(require_util_base64.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")]
+	]);
+	if (asset.original.filter === "jbig2") {
+		entries.set("ColorSpace", require_objects.pdfName("DeviceGray"));
+		entries.set("BitsPerComponent", require_objects.pdfNum(1));
+	}
+	return {
+		dict: require_objects.pdfDict(entries),
+		raw: require_util_base64.base64ToBytes(asset.original.base64),
+		...png.alpha !== void 0 ? { alpha: png.alpha } : {}
+	};
+}
 function prepareImage(asset, compress) {
+	if (asset.original !== void 0) return preparePassthroughImage(asset, compress);
 	const bytes = require_util_base64.base64ToBytes(asset.base64);
 	return asset.format === "jpeg" ? prepareJpegImage(bytes) : preparePngImage(bytes, compress);
 }
@@ -361,9 +382,13 @@ function writePdf(doc, options = {}) {
 		const prepared = prepareImage(asset, compress);
 		const imageNum = nextObjNum++;
 		const smaskNum = prepared.alpha === void 0 ? void 0 : nextObjNum++;
+		const globalsBase64 = asset.original?.filter === "jbig2" ? asset.original.jbig2GlobalsBase64 : void 0;
+		const globalsNum = globalsBase64 !== void 0 ? nextObjNum++ : void 0;
 		imageAllocs.set(imageId, {
 			imageNum,
 			smaskNum,
+			globalsNum,
+			globalsBase64,
 			resourceName: `Im${index + 1}`,
 			prepared
 		});
@@ -414,7 +439,7 @@ function writePdf(doc, options = {}) {
 	const formObjectNums = [];
 	const countFieldObjects = (fields) => {
 		let n = 0;
-		for (const field of fields) n += 1 + (field.fieldType !== "group" && field.widgets.length > 1 ? field.widgets.length - 1 : 0) + countFieldObjects(field.children);
+		for (const field of fields) n += 1 + (field.fieldType !== "group" && field.widgets.length > 1 ? field.widgets.length : 0) + countFieldObjects(field.children);
 		return n;
 	};
 	for (let i = 0; i < countFieldObjects(doc.form ?? []); i += 1) formObjectNums.push(nextObjNum++);
@@ -424,7 +449,7 @@ function writePdf(doc, options = {}) {
 	const claimFormNums = (fields) => {
 		for (const field of fields) {
 			formNumByField.set(field, formObjectNums[formNumCursor++]);
-			if (field.fieldType !== "group" && field.widgets.length > 1) formExtraWidgetNums.set(field, field.widgets.slice(1).map(() => formObjectNums[formNumCursor++]));
+			if (field.fieldType !== "group" && field.widgets.length > 1) formExtraWidgetNums.set(field, field.widgets.map(() => formObjectNums[formNumCursor++]));
 			claimFormNums(field.children);
 		}
 	};
@@ -576,6 +601,12 @@ function writePdf(doc, options = {}) {
 			})
 		});
 	}
+	const widgetAnnotsByPage = /* @__PURE__ */ new Map();
+	const noteWidgetAnnot = (widget, ref) => {
+		const existing = widgetAnnotsByPage.get(widget.pageIndex);
+		if (existing === void 0) widgetAnnotsByPage.set(widget.pageIndex, [ref]);
+		else existing.push(ref);
+	};
 	const widgetRectArray = (widget) => require_objects.pdfArray([
 		widget.xPt,
 		widget.yPt,
@@ -624,9 +655,14 @@ function writePdf(doc, options = {}) {
 					entries.push(["Subtype", require_objects.pdfName("Widget")]);
 					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) {
 					const extraNums = formExtraWidgetNums.get(field) ?? [];
-					entries.push(["Kids", require_objects.pdfArray([widgetDict(firstWidget), ...extraNums.map((num) => require_objects.pdfRef(num, 0))])]);
+					entries.push(["Kids", require_objects.pdfArray(extraNums.map((num) => require_objects.pdfRef(num, 0)))]);
+					for (const [index, num] of extraNums.entries()) {
+						const widget = field.widgets[index];
+						if (widget !== void 0) noteWidgetAnnot(widget, require_objects.pdfRef(num, 0));
+					}
 				}
 			}
 			objects.push({
@@ -635,8 +671,8 @@ function writePdf(doc, options = {}) {
 			});
 			const extraNums = formExtraWidgetNums.get(field) ?? [];
 			for (const [index, num] of extraNums.entries()) {
-				const widget = field.widgets[index + 1];
-				objects.push({
+				const widget = field.widgets[index];
+				if (widget !== void 0) objects.push({
 					num,
 					value: widgetDict(widget)
 				});
@@ -697,6 +733,14 @@ function writePdf(doc, options = {}) {
 				value: require_objects.pdfStream(alloc.prepared.alpha.dict, alloc.prepared.alpha.raw)
 			});
 		}
+		if (alloc.globalsNum !== void 0 && alloc.globalsBase64 !== void 0) {
+			const globalsRaw = require_util_base64.base64ToBytes(alloc.globalsBase64);
+			alloc.prepared.dict.entries.set("DecodeParms", require_objects.pdfDict({ JBIG2Globals: require_objects.pdfRef(alloc.globalsNum, 0) }));
+			objects.push({
+				num: alloc.globalsNum,
+				value: require_objects.pdfStream(require_objects.pdfDict(compress ? /* @__PURE__ */ new Map([["Filter", require_objects.pdfName("FlateDecode")]]) : /* @__PURE__ */ new Map()), compress ? require_bytes_flate.deflate(globalsRaw) : globalsRaw)
+			});
+		}
 		objects.push({
 			num: alloc.imageNum,
 			value: require_objects.pdfStream(alloc.prepared.dict, alloc.prepared.raw)
@@ -833,6 +877,7 @@ function writePdf(doc, options = {}) {
 		});
 		const annots = [...page.items.filter(isLinkItem).map((link) => buildLinkAnnotDict(link)), ...page.items.filter(isInternalLinkItem).map((link) => buildInternalLinkAnnotDict(link, doc, pageAllocs))];
 		if (page.notes !== void 0 && page.notes.length > 0) annots.push(buildNotesAnnotDict(page.notes));
+		annots.push(...widgetAnnotsByPage.get(pageIndex) ?? []);
 		const pageEntries = /* @__PURE__ */ new Map([
 			["Type", require_objects.pdfName("Page")],
 			["Parent", require_objects.pdfRef(pagesNum, 0)],

package/dist/write.d.cts

@@ -1,5 +1,5 @@
 import { LayoutDocument } from "./layout.cjs";
-import { r as EmbeddedFaceSubstitution } from "./embedded-font-oc65VGlr.cjs";
+import { r as EmbeddedFaceSubstitution } from "./embedded-font-DJUn9kMH.cjs";
 import { WinAnsiSubstitution } from "./winansi.cjs";
 import { PdfEncryptionOptions } from "./encrypt-write.cjs";
 import { FontRegistry } from "./font-registry.cjs";

package/dist/write.d.ts

@@ -1,5 +1,5 @@
 import { LayoutDocument } from "./layout.js";
-import { r as EmbeddedFaceSubstitution } from "./embedded-font-B4p9a3O3.js";
+import { r as EmbeddedFaceSubstitution } from "./embedded-font-BRhZfEN2.js";
 import { WinAnsiSubstitution } from "./winansi.js";
 import { PdfEncryptionOptions } from "./encrypt-write.js";
 import { FontRegistry } from "./font-registry.js";

package/dist/write.js

@@ -205,7 +205,28 @@ function preparePngImage(bytes, compress) {
 		}
 	};
 }
+function preparePassthroughImage(asset, compress) {
+	if (asset.original === void 0) throw new Error("preparePassthroughImage: asset carries no original stream");
+	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")]
+	]);
+	if (asset.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 } : {}
+	};
+}
 function prepareImage(asset, compress) {
+	if (asset.original !== void 0) return preparePassthroughImage(asset, compress);
 	const bytes = base64ToBytes(asset.base64);
 	return asset.format === "jpeg" ? prepareJpegImage(bytes) : preparePngImage(bytes, compress);
 }
@@ -360,9 +381,13 @@ function writePdf(doc, options = {}) {
 		const prepared = prepareImage(asset, compress);
 		const imageNum = nextObjNum++;
 		const smaskNum = prepared.alpha === void 0 ? void 0 : nextObjNum++;
+		const globalsBase64 = asset.original?.filter === "jbig2" ? asset.original.jbig2GlobalsBase64 : void 0;
+		const globalsNum = globalsBase64 !== void 0 ? nextObjNum++ : void 0;
 		imageAllocs.set(imageId, {
 			imageNum,
 			smaskNum,
+			globalsNum,
+			globalsBase64,
 			resourceName: `Im${index + 1}`,
 			prepared
 		});
@@ -413,7 +438,7 @@ function writePdf(doc, options = {}) {
 	const formObjectNums = [];
 	const countFieldObjects = (fields) => {
 		let n = 0;
-		for (const field of fields) n += 1 + (field.fieldType !== "group" && field.widgets.length > 1 ? field.widgets.length - 1 : 0) + countFieldObjects(field.children);
+		for (const field of fields) n += 1 + (field.fieldType !== "group" && field.widgets.length > 1 ? field.widgets.length : 0) + countFieldObjects(field.children);
 		return n;
 	};
 	for (let i = 0; i < countFieldObjects(doc.form ?? []); i += 1) formObjectNums.push(nextObjNum++);
@@ -423,7 +448,7 @@ function writePdf(doc, options = {}) {
 	const claimFormNums = (fields) => {
 		for (const field of fields) {
 			formNumByField.set(field, formObjectNums[formNumCursor++]);
-			if (field.fieldType !== "group" && field.widgets.length > 1) formExtraWidgetNums.set(field, field.widgets.slice(1).map(() => formObjectNums[formNumCursor++]));
+			if (field.fieldType !== "group" && field.widgets.length > 1) formExtraWidgetNums.set(field, field.widgets.map(() => formObjectNums[formNumCursor++]));
 			claimFormNums(field.children);
 		}
 	};
@@ -575,6 +600,12 @@ function writePdf(doc, options = {}) {
 			})
 		});
 	}
+	const widgetAnnotsByPage = /* @__PURE__ */ new Map();
+	const noteWidgetAnnot = (widget, ref) => {
+		const existing = widgetAnnotsByPage.get(widget.pageIndex);
+		if (existing === void 0) widgetAnnotsByPage.set(widget.pageIndex, [ref]);
+		else existing.push(ref);
+	};
 	const widgetRectArray = (widget) => pdfArray([
 		widget.xPt,
 		widget.yPt,
@@ -623,9 +654,14 @@ function writePdf(doc, options = {}) {
 					entries.push(["Subtype", pdfName("Widget")]);
 					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) {
 					const extraNums = formExtraWidgetNums.get(field) ?? [];
-					entries.push(["Kids", pdfArray([widgetDict(firstWidget), ...extraNums.map((num) => pdfRef(num, 0))])]);
+					entries.push(["Kids", pdfArray(extraNums.map((num) => pdfRef(num, 0)))]);
+					for (const [index, num] of extraNums.entries()) {
+						const widget = field.widgets[index];
+						if (widget !== void 0) noteWidgetAnnot(widget, pdfRef(num, 0));
+					}
 				}
 			}
 			objects.push({
@@ -634,8 +670,8 @@ function writePdf(doc, options = {}) {
 			});
 			const extraNums = formExtraWidgetNums.get(field) ?? [];
 			for (const [index, num] of extraNums.entries()) {
-				const widget = field.widgets[index + 1];
-				objects.push({
+				const widget = field.widgets[index];
+				if (widget !== void 0) objects.push({
 					num,
 					value: widgetDict(widget)
 				});
@@ -696,6 +732,14 @@ function writePdf(doc, options = {}) {
 				value: pdfStream(alloc.prepared.alpha.dict, alloc.prepared.alpha.raw)
 			});
 		}
+		if (alloc.globalsNum !== void 0 && alloc.globalsBase64 !== void 0) {
+			const globalsRaw = base64ToBytes(alloc.globalsBase64);
+			alloc.prepared.dict.entries.set("DecodeParms", pdfDict({ JBIG2Globals: pdfRef(alloc.globalsNum, 0) }));
+			objects.push({
+				num: alloc.globalsNum,
+				value: pdfStream(pdfDict(compress ? /* @__PURE__ */ new Map([["Filter", pdfName("FlateDecode")]]) : /* @__PURE__ */ new Map()), compress ? deflate(globalsRaw) : globalsRaw)
+			});
+		}
 		objects.push({
 			num: alloc.imageNum,
 			value: pdfStream(alloc.prepared.dict, alloc.prepared.raw)
@@ -832,6 +876,7 @@ function writePdf(doc, options = {}) {
 		});
 		const annots = [...page.items.filter(isLinkItem).map((link) => buildLinkAnnotDict(link)), ...page.items.filter(isInternalLinkItem).map((link) => buildInternalLinkAnnotDict(link, doc, pageAllocs))];
 		if (page.notes !== void 0 && page.notes.length > 0) annots.push(buildNotesAnnotDict(page.notes));
+		annots.push(...widgetAnnotsByPage.get(pageIndex) ?? []);
 		const pageEntries = /* @__PURE__ */ new Map([
 			["Type", pdfName("Page")],
 			["Parent", pdfRef(pagesNum, 0)],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdf-parser.js",
-  "version": "4.5.6",
+  "version": "4.7.0",
   "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": {
@@ -72,8 +72,8 @@
   ],
   "license": "MIT",
   "dependencies": {
-    "byte-codec": "1.4.2",
-    "document-schema.js": "7.9.1",
+    "byte-codec": "1.5.0",
+    "document-schema.js": "7.11.0",
     "fflate": "0.8.3",
     "zod": "4.4.3"
   },

package/dist/gsub-table-BRTQ8EUW.d.ts

@@ -1,10 +0,0 @@
-import { t as SfntFont } from "./sfnt-V08bb5ut.js";
-//#region src/gsub-table.d.ts
-interface GsubShaping {
-  readonly glyphIds: number[];
-  readonly spans: number[];
-}
-type GsubShaper = (glyphIds: readonly number[]) => GsubShaping;
-declare function buildGsubShaper(font: SfntFont): GsubShaper | undefined;
-//#endregion
-export { GsubShaping as n, buildGsubShaper as r, GsubShaper as t };

package/dist/gsub-table-URczLd85.d.cts

@@ -1,10 +0,0 @@
-import { t as SfntFont } from "./sfnt-V08bb5ut.cjs";
-//#region src/gsub-table.d.ts
-interface GsubShaping {
-  readonly glyphIds: number[];
-  readonly spans: number[];
-}
-type GsubShaper = (glyphIds: readonly number[]) => GsubShaping;
-declare function buildGsubShaper(font: SfntFont): GsubShaper | undefined;
-//#endregion
-export { GsubShaping as n, buildGsubShaper as r, GsubShaper as t };