node-poppler 6.2.7 → 7.0.1

package/README.md

@@ -81,7 +81,7 @@ Example of an `async` `await` call to `poppler.pdfToCairo()`, to convert only th
 PDF file using stdout:
 
 ```js
-const fs = require("fs");
+const { writeFile } = require("node:fs/promises");
 const { Poppler } = require("node-poppler");
 
 const file = "test_document.pdf";
@@ -93,7 +93,7 @@ const options = {
 
 const res = await poppler.pdfToCairo(file, undefined, options);
 // pdfToCairo writes to stdout using binary encoding if pdfFile or singleFile options are used
-await fs.writeFile("new_file.pdf", res, { encoding: "binary" });
+await writeFile("new_file.pdf", res, { encoding: "binary" });
 ```
 
 ### poppler.pdfToHtml
@@ -110,27 +110,39 @@ const options = {
 	lastPageToConvert: 2,
 };
 
-poppler.pdfToHtml(file, undefined, options).then((res) => {
-	console.log(res);
-});
+poppler
+	.pdfToHtml(file, undefined, options)
+	.then((res) => {
+		console.log(res);
+	})
+	.catch((err) => {
+		console.error(err);
+		throw err;
+	});
 ```
 
 Example of calling `poppler.pdfToHtml()` with a promise chain, providing a Buffer as an input:
 
 ```js
-const fs = require("fs");
+const { readFileSync } = require("node:fs");
 const { Poppler } = require("node-poppler");
 
-const file = fs.readFileSync("test_document.pdf");
+const file = readFileSync("test_document.pdf");
 const poppler = new Poppler();
 const options = {
 	firstPageToConvert: 1,
 	lastPageToConvert: 2,
 };
 
-poppler.pdfToHtml(file, "tester.html", options).then((res) => {
-	console.log(res);
-});
+poppler
+	.pdfToHtml(file, "tester.html", options)
+	.then((res) => {
+		console.log(res);
+	})
+	.catch((err) => {
+		console.error(err);
+		throw err;
+	});
 ```
 
 ### poppler.pdfToText
@@ -147,9 +159,15 @@ const options = {
 	lastPageToConvert: 2,
 };
 
-poppler.pdfToText(file, options).then((res) => {
-	console.log(res);
-});
+poppler
+	.pdfToText(file, options)
+	.then((res) => {
+		console.log(res);
+	})
+	.catch((err) => {
+		console.error(err);
+		throw err;
+	});
 ```
 
 ## Contributing

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-poppler",
-	"version": "6.2.7",
+	"version": "7.0.1",
 	"description": "Asynchronous node.js wrapper for the Poppler PDF rendering library",
 	"keywords": [
 		"async",
@@ -33,6 +33,7 @@
 		"unite"
 	],
 	"main": "src/index.js",
+	"type": "commonjs",
 	"types": "types/index.d.ts",
 	"repository": "git+https://github.com/Fdawgs/node-poppler.git",
 	"homepage": "https://github.com/Fdawgs/node-poppler",
@@ -43,7 +44,7 @@
 	"author": "Frazer Smith <frazer.dev@outlook.com>",
 	"funding": "https://github.com/sponsors/Fdawgs",
 	"engines": {
-		"node": ">=14.0.0"
+		"node": ">=18.0.0"
 	},
 	"dependencies": {
 		"camelcase": "^6.3.0",

package/src/index.js

@@ -1,10 +1,10 @@
 "use strict";
 
-const { execFile, spawn } = require("child_process");
-const { promisify } = require("util");
+const { execFile, spawn } = require("node:child_process");
+const { promisify } = require("node:util");
 const camelCase = require("camelcase");
 const { lt } = require("semver");
-const path = require("upath");
+const { joinSafe, normalizeTrim } = require("upath");
 
 const execFileAsync = promisify(execFile);
 
@@ -23,24 +23,28 @@ const errorMessages = {
  * @description Checks each option provided is valid, of the correct type, and can be used by specified
  * version of binary.
  * @ignore
- * @param {object} acceptedOptions - Object containing options that a binary accepts.
+ * @param {object} acceptedOptions - Object containing accepted options.
  * @param {object} options - Object containing options to pass to binary.
  * @param {string} [version] - Version of binary.
  * @returns {string[]} Array of CLI arguments.
  * @throws If invalid arguments provided.
  */
 function parseOptions(acceptedOptions, options, version) {
+	/** @type {string[]} */
 	const args = [];
+	/** @type {string[]} */
 	const invalidArgs = [];
 	Object.keys(options).forEach((key) => {
-		if (Object.prototype.hasOwnProperty.call(acceptedOptions, key)) {
+		if (Object.hasOwn(acceptedOptions, key)) {
 			// eslint-disable-next-line valid-typeof
 			if (typeof options[key] === acceptedOptions[key].type) {
 				// Skip boolean options if false
+
 				if (acceptedOptions[key].type === "boolean" && !options[key]) {
 					return;
 				}
 				// Arg will be empty for some non-standard options
+
 				if (acceptedOptions[key].arg !== "") {
 					args.push(acceptedOptions[key].arg);
 				}
@@ -59,6 +63,7 @@ function parseOptions(acceptedOptions, options, version) {
 			if (
 				acceptedOptions[key].minVersion &&
 				version &&
+				// @ts-ignore: type checking is done above
 				lt(version, acceptedOptions[key].minVersion, { loose: true })
 			) {
 				invalidArgs.push(
@@ -76,14 +81,12 @@ function parseOptions(acceptedOptions, options, version) {
 }
 
 class Poppler {
-	/**
-	 * @param {string} [binPath] - Path of poppler-utils binaries.
-	 */
+	/** @param {string} [binPath] - Path of poppler-utils binaries. */
 	constructor(binPath) {
 		if (binPath) {
-			this.popplerPath = path.normalizeTrim(binPath);
+			this.popplerPath = normalizeTrim(binPath);
 		} else if (process.platform === "win32") {
-			this.popplerPath = path.joinSafe(
+			this.popplerPath = joinSafe(
 				__dirname,
 				"lib",
 				"win32",
@@ -122,7 +125,7 @@ class Poppler {
 			args.push(outputFile);
 
 			const { stdout } = await execFileAsync(
-				path.joinSafe(this.popplerPath, "pdfattach"),
+				joinSafe(this.popplerPath, "pdfattach"),
 				args
 			);
 			return Promise.resolve(stdout);
@@ -179,7 +182,7 @@ class Poppler {
 			args.push(file);
 
 			const { stdout } = await execFileAsync(
-				path.joinSafe(this.popplerPath, "pdfdetach"),
+				joinSafe(this.popplerPath, "pdfdetach"),
 				args
 			);
 			return Promise.resolve(stdout);
@@ -214,10 +217,11 @@ class Poppler {
 
 		try {
 			const { stderr } = await execFileAsync(
-				path.joinSafe(this.popplerPath, "pdffonts"),
+				joinSafe(this.popplerPath, "pdffonts"),
 				["-v"]
 			);
 
+			// @ts-ignore: parseOptions checks if falsy
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
@@ -230,7 +234,7 @@ class Poppler {
 				}
 
 				const child = spawn(
-					path.joinSafe(this.popplerPath, "pdffonts"),
+					joinSafe(this.popplerPath, "pdffonts"),
 					args
 				);
 
@@ -250,11 +254,23 @@ class Poppler {
 					stdErr += data;
 				});
 
-				child.on("close", () => {
+				child.on("close", (code) => {
+					/* istanbul ignore else */
 					if (stdOut !== "") {
 						resolve(stdOut.trim());
+					} else if (code === 0) {
+						resolve(errorMessages[code]);
+					} else if (stdErr !== "") {
+						reject(new Error(stdErr.trim()));
 					} else {
-						reject(new Error(stdErr ? stdErr.trim() : undefined));
+						reject(
+							new Error(
+								errorMessages[code] ||
+									`pdffonts ${args.join(
+										" "
+									)} exited with code ${code}`
+							)
+						);
 					}
 				});
 			});
@@ -306,10 +322,11 @@ class Poppler {
 
 		try {
 			const { stderr } = await execFileAsync(
-				path.joinSafe(this.popplerPath, "pdfimages"),
+				joinSafe(this.popplerPath, "pdfimages"),
 				["-v"]
 			);
 
+			// @ts-ignore: parseOptions checks if falsy
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
@@ -326,7 +343,7 @@ class Poppler {
 				}
 
 				const child = spawn(
-					path.joinSafe(this.popplerPath, "pdfimages"),
+					joinSafe(this.popplerPath, "pdfimages"),
 					args
 				);
 
@@ -347,6 +364,7 @@ class Poppler {
 				});
 
 				child.on("close", (code) => {
+					/* istanbul ignore else */
 					if (stdOut !== "") {
 						resolve(stdOut.trim());
 					} else if (code === 0) {
@@ -354,8 +372,14 @@ class Poppler {
 					} else if (stdErr !== "") {
 						reject(new Error(stdErr.trim()));
 					} else {
-						/* istanbul ignore next */
-						reject(new Error(errorMessages[code]));
+						reject(
+							new Error(
+								errorMessages[code] ||
+									`pdfimages ${args.join(
+										" "
+									)} exited with code ${code}`
+							)
+						);
 					}
 				});
 			});
@@ -396,7 +420,8 @@ class Poppler {
 	 * such as Link Annotations are listed, not URL strings in the text content.
 	 * @param {boolean} [options.printVersionInfo] - Print copyright and version info.
 	 * @param {string} [options.userPassword] - User password (for encrypted files).
-	 * @returns {Promise<string>} A promise that resolves with a stdout string, or rejects with an `Error` object.
+	 * @returns {Promise<object|string>} A promise that resolves with a stdout string or JSON object if
+	 * `options.printAsJson` is `true`, or rejects with an `Error` object.
 	 */
 	async pdfInfo(file, options = {}) {
 		const acceptedOptions = {
@@ -421,10 +446,11 @@ class Poppler {
 
 		try {
 			const { stderr } = await execFileAsync(
-				path.joinSafe(this.popplerPath, "pdfinfo"),
+				joinSafe(this.popplerPath, "pdfinfo"),
 				["-v"]
 			);
 
+			// @ts-ignore: parseOptions checks if falsy
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
@@ -433,6 +459,7 @@ class Poppler {
 			 * Poppler does not set the "File size" metadata value if passed
 			 * a Buffer via stdin, so need to retrieve it from the Buffer
 			 */
+			/** @type {number} */
 			let fileSize;
 
 			return new Promise((resolve, reject) => {
@@ -443,8 +470,8 @@ class Poppler {
 					args.push(file);
 				}
 
-				const child = execFile(
-					path.joinSafe(this.popplerPath, "pdfinfo"),
+				const child = spawn(
+					joinSafe(this.popplerPath, "pdfinfo"),
 					args
 				);
 
@@ -464,7 +491,8 @@ class Poppler {
 					stdErr += data;
 				});
 
-				child.on("close", () => {
+				child.on("close", (code) => {
+					/* istanbul ignore else */
 					if (stdOut !== "") {
 						if (fileSize) {
 							stdOut = stdOut.replace(
@@ -473,15 +501,16 @@ class Poppler {
 							);
 						}
 
+						/**
+						 * Convert output to JSON.
+						 * @see {@link https://github.com/Fdawgs/node-poppler/issues/248#issuecomment-845948080 | Node-Poppler Issue #248}
+						 */
 						if (options.printAsJson === true) {
-							/**
-							 * Thanks to @sainf for this solution
-							 * https://github.com/Fdawgs/node-poppler/issues/248#issuecomment-845948080
-							 */
 							const info = {};
 							stdOut.split("\n").forEach((line) => {
 								const lines = line.split(": ");
 								if (lines.length > 1) {
+									// @ts-ignore: creating dynamic object keys
 									info[camelCase(lines[0])] = lines[1].trim();
 								}
 							});
@@ -489,8 +518,19 @@ class Poppler {
 						} else {
 							resolve(stdOut.trim());
 						}
+					} else if (code === 0) {
+						resolve(errorMessages[code]);
+					} else if (stdErr !== "") {
+						reject(new Error(stdErr.trim()));
 					} else {
-						reject(new Error(stdErr ? stdErr.trim() : undefined));
+						reject(
+							new Error(
+								errorMessages[code] ||
+									`pdfinfo ${args.join(
+										" "
+									)} exited with code ${code}`
+							)
+						);
 					}
 				});
 			});
@@ -525,10 +565,11 @@ class Poppler {
 
 		try {
 			const { stderr } = await execFileAsync(
-				path.joinSafe(this.popplerPath, "pdfseparate"),
+				joinSafe(this.popplerPath, "pdfseparate"),
 				["-v"]
 			);
 
+			// @ts-ignore: parseOptions checks if falsy
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
@@ -536,7 +577,7 @@ class Poppler {
 			args.push(outputPattern);
 
 			const { stdout } = await execFileAsync(
-				path.joinSafe(this.popplerPath, "pdfseparate"),
+				joinSafe(this.popplerPath, "pdfseparate"),
 				args
 			);
 			return Promise.resolve(stdout);
@@ -702,10 +743,11 @@ class Poppler {
 
 		try {
 			const { stderr } = await execFileAsync(
-				path.joinSafe(this.popplerPath, "pdftocairo"),
+				joinSafe(this.popplerPath, "pdftocairo"),
 				["-v"]
 			);
 
+			// @ts-ignore: parseOptions checks if falsy
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
@@ -724,7 +766,7 @@ class Poppler {
 				}
 
 				const child = spawn(
-					path.joinSafe(this.popplerPath, "pdftocairo"),
+					joinSafe(this.popplerPath, "pdftocairo"),
 					args
 				);
 
@@ -752,6 +794,7 @@ class Poppler {
 				});
 
 				child.on("close", (code) => {
+					/* istanbul ignore else */
 					if (stdOut !== "") {
 						resolve(stdOut.trim());
 					} else if (code === 0) {
@@ -759,8 +802,14 @@ class Poppler {
 					} else if (stdErr !== "") {
 						reject(new Error(stdErr.trim()));
 					} else {
-						/* istanbul ignore next */
-						reject(new Error(errorMessages[code]));
+						reject(
+							new Error(
+								errorMessages[code] ||
+									`pdftocairo ${args.join(
+										" "
+									)} exited with code ${code}`
+							)
+						);
 					}
 				});
 			});
@@ -842,10 +891,11 @@ class Poppler {
 
 		try {
 			const { stderr } = await execFileAsync(
-				path.joinSafe(this.popplerPath, "pdftohtml"),
+				joinSafe(this.popplerPath, "pdftohtml"),
 				["-v"]
 			);
 
+			// @ts-ignore: parseOptions checks if falsy
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
@@ -862,7 +912,7 @@ class Poppler {
 				}
 
 				const child = spawn(
-					path.joinSafe(this.popplerPath, "pdftohtml"),
+					joinSafe(this.popplerPath, "pdftohtml"),
 					args
 				);
 
@@ -884,7 +934,7 @@ class Poppler {
 
 				/**
 				 * pdfToHtml does not return an exit code so check output to see if it was successful.
-				 * See https://gitlab.freedesktop.org/poppler/poppler/-/blob/master/utils/pdftohtml.1
+				 * @see {@link  https://gitlab.freedesktop.org/poppler/poppler/-/blob/master/utils/pdftohtml.1 | Poppler pdftohtml man}
 				 */
 				child.on("close", () => {
 					if (stdOut !== "") {
@@ -1046,10 +1096,11 @@ class Poppler {
 
 		try {
 			const { stderr } = await execFileAsync(
-				path.joinSafe(this.popplerPath, "pdftoppm"),
+				joinSafe(this.popplerPath, "pdftoppm"),
 				["-v"]
 			);
 
+			// @ts-ignore: parseOptions checks if falsy
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
@@ -1064,7 +1115,7 @@ class Poppler {
 				args.push(outputPath);
 
 				const child = spawn(
-					path.joinSafe(this.popplerPath, "pdftoppm"),
+					joinSafe(this.popplerPath, "pdftoppm"),
 					args
 				);
 
@@ -1080,13 +1131,20 @@ class Poppler {
 				});
 
 				child.on("close", (code) => {
+					/* istanbul ignore else */
 					if (stdErr !== "") {
 						reject(new Error(stdErr.trim()));
 					} else if (code === 0) {
 						resolve(errorMessages[code]);
 					} else {
-						/* istanbul ignore next */
-						reject(new Error(errorMessages[code]));
+						reject(
+							new Error(
+								errorMessages[code] ||
+									`pdftoppm ${args.join(
+										" "
+									)} exited with code ${code}`
+							)
+						);
 					}
 				});
 			});
@@ -1266,7 +1324,7 @@ class Poppler {
 			processColorFormat: { arg: "-processcolorformat", type: "string" },
 			quiet: { arg: "-q", type: "boolean" },
 			rasterize: {
-				args: "-rasterize",
+				arg: "-rasterize",
 				type: "string",
 				minVersion: "0.90.0",
 			},
@@ -1276,10 +1334,11 @@ class Poppler {
 
 		try {
 			const { stderr } = await execFileAsync(
-				path.joinSafe(this.popplerPath, "pdftops"),
+				joinSafe(this.popplerPath, "pdftops"),
 				["-v"]
 			);
 
+			// @ts-ignore: parseOptions checks if falsy
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
@@ -1298,7 +1357,7 @@ class Poppler {
 				}
 
 				const child = spawn(
-					path.joinSafe(this.popplerPath, "pdftops"),
+					joinSafe(this.popplerPath, "pdftops"),
 					args
 				);
 
@@ -1319,6 +1378,7 @@ class Poppler {
 				});
 
 				child.on("close", (code) => {
+					/* istanbul ignore else */
 					if (stdOut !== "") {
 						resolve(stdOut.trim());
 					} else if (code === 0) {
@@ -1326,8 +1386,14 @@ class Poppler {
 					} else if (stdErr !== "") {
 						reject(new Error(stdErr.trim()));
 					} else {
-						/* istanbul ignore next */
-						reject(new Error(errorMessages[code]));
+						reject(
+							new Error(
+								errorMessages[code] ||
+									`pdftops ${args.join(
+										" "
+									)} exited with code ${code}`
+							)
+						);
 					}
 				});
 			});
@@ -1425,10 +1491,11 @@ class Poppler {
 
 		try {
 			const { stderr } = await execFileAsync(
-				path.joinSafe(this.popplerPath, "pdftotext"),
+				joinSafe(this.popplerPath, "pdftotext"),
 				["-v"]
 			);
 
+			// @ts-ignore: parseOptions checks if falsy
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
@@ -1447,7 +1514,7 @@ class Poppler {
 				}
 
 				const child = spawn(
-					path.joinSafe(this.popplerPath, "pdftotext"),
+					joinSafe(this.popplerPath, "pdftotext"),
 					args
 				);
 
@@ -1468,6 +1535,7 @@ class Poppler {
 				});
 
 				child.on("close", (code) => {
+					/* istanbul ignore else */
 					if (stdOut !== "") {
 						resolve(stdOut.trim());
 					} else if (code === 0) {
@@ -1475,8 +1543,14 @@ class Poppler {
 					} else if (stdErr !== "") {
 						reject(new Error(stdErr.trim()));
 					} else {
-						/* istanbul ignore next */
-						reject(new Error(errorMessages[code]));
+						reject(
+							new Error(
+								errorMessages[code] ||
+									`pdftotext ${args.join(
+										" "
+									)} exited with code ${code}`
+							)
+						);
 					}
 				});
 			});
@@ -1503,10 +1577,11 @@ class Poppler {
 
 		try {
 			const { stderr } = await execFileAsync(
-				path.joinSafe(this.popplerPath, "pdfunite"),
+				joinSafe(this.popplerPath, "pdfunite"),
 				["-v"]
 			);
 
+			// @ts-ignore: parseOptions checks if falsy
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/u.exec(stderr)[1];
 
 			const args = parseOptions(acceptedOptions, options, versionInfo);
@@ -1516,7 +1591,7 @@ class Poppler {
 			args.push(outputFile);
 
 			const { stdout } = await execFileAsync(
-				path.joinSafe(this.popplerPath, "pdfunite"),
+				joinSafe(this.popplerPath, "pdfunite"),
 				args
 			);
 			return Promise.resolve(stdout);

package/types/index.d.ts

@@ -1,9 +1,7 @@
 export default Poppler;
 export class Poppler {
-	/**
-	 * @param {string} [binPath] - Path of poppler-utils binaries.
-	 */
-	constructor(binPath?: string | undefined);
+	/** @param {string} [binPath] - Path of poppler-utils binaries. */
+	constructor(binPath?: string);
 	popplerPath: string;
 	/**
 	 * @author Frazer Smith
@@ -20,12 +18,10 @@ export class Poppler {
 		file: string,
 		fileToAttach: string,
 		outputFile: string,
-		options?:
-			| {
-					printVersionInfo?: boolean | undefined;
-					replace?: boolean | undefined;
-			  }
-			| undefined
+		options?: {
+			printVersionInfo?: boolean;
+			replace?: boolean;
+		}
 	): Promise<string>;
 	/**
 	 * @author Frazer Smith
@@ -55,19 +51,17 @@ export class Poppler {
 	 */
 	pdfDetach(
 		file: string,
-		options?:
-			| {
-					listEmbedded?: boolean | undefined;
-					ownerPassword?: string | undefined;
-					outputEncoding?: string | undefined;
-					outputPath?: string | undefined;
-					printVersionInfo?: boolean | undefined;
-					saveAllFiles?: boolean | undefined;
-					saveFile?: string | undefined;
-					saveSpecificFile?: number | undefined;
-					userPassword?: string | undefined;
-			  }
-			| undefined
+		options?: {
+			listEmbedded?: boolean;
+			ownerPassword?: string;
+			outputEncoding?: string;
+			outputPath?: string;
+			printVersionInfo?: boolean;
+			saveAllFiles?: boolean;
+			saveFile?: string;
+			saveSpecificFile?: number;
+			userPassword?: string;
+		}
 	): Promise<string>;
 	/**
 	 * @author Frazer Smith
@@ -85,16 +79,14 @@ export class Poppler {
 	 */
 	pdfFonts(
 		file: Buffer | string,
-		options?:
-			| {
-					firstPageToExamine?: number | undefined;
-					lastPageToExamine?: number | undefined;
-					listSubstitutes?: boolean | undefined;
-					ownerPassword?: string | undefined;
-					printVersionInfo?: boolean | undefined;
-					userPassword?: string | undefined;
-			  }
-			| undefined
+		options?: {
+			firstPageToExamine?: number;
+			lastPageToExamine?: number;
+			listSubstitutes?: boolean;
+			ownerPassword?: string;
+			printVersionInfo?: boolean;
+			userPassword?: string;
+		}
 	): Promise<string>;
 	/**
 	 * @author Frazer Smith
@@ -122,24 +114,22 @@ export class Poppler {
 	 */
 	pdfImages(
 		file: Buffer | string,
-		outputPrefix?: string | undefined,
-		options?:
-			| {
-					allFiles?: boolean | undefined;
-					ccittFile?: boolean | undefined;
-					firstPageToConvert?: number | undefined;
-					lastPageToConvert?: number | undefined;
-					list?: boolean | undefined;
-					jbig2File?: boolean | undefined;
-					jpeg2000File?: boolean | undefined;
-					jpegFile?: boolean | undefined;
-					ownerPassword?: string | undefined;
-					pngFile?: boolean | undefined;
-					printVersionInfo?: boolean | undefined;
-					tiffFile?: boolean | undefined;
-					userPassword?: string | undefined;
-			  }
-			| undefined
+		outputPrefix?: string,
+		options?: {
+			allFiles?: boolean;
+			ccittFile?: boolean;
+			firstPageToConvert?: number;
+			lastPageToConvert?: number;
+			list?: boolean;
+			jbig2File?: boolean;
+			jpeg2000File?: boolean;
+			jpegFile?: boolean;
+			ownerPassword?: string;
+			pngFile?: boolean;
+			printVersionInfo?: boolean;
+			tiffFile?: boolean;
+			userPassword?: string;
+		}
 	): Promise<string>;
 	/**
 	 * @author Frazer Smith
@@ -173,32 +163,31 @@ export class Poppler {
 	 * such as Link Annotations are listed, not URL strings in the text content.
 	 * @param {boolean} [options.printVersionInfo] - Print copyright and version info.
 	 * @param {string} [options.userPassword] - User password (for encrypted files).
-	 * @returns {Promise<string>} A promise that resolves with a stdout string, or rejects with an `Error` object.
+	 * @returns {Promise<object|string>} A promise that resolves with a stdout string or JSON object if
+	 * `options.printAsJson` is `true`, or rejects with an `Error` object.
 	 */
 	pdfInfo(
 		file: Buffer | string,
-		options?:
-			| {
-					firstPageToConvert?: number | undefined;
-					lastPageToConvert?: number | undefined;
-					listEncodingOptions?: boolean | undefined;
-					outputEncoding?: string | undefined;
-					ownerPassword?: string | undefined;
-					printAsJson?: boolean | undefined;
-					printBoundingBoxes?: boolean | undefined;
-					printDocStruct?: boolean | undefined;
-					printDocStructText?: boolean | undefined;
-					printIsoDates?: boolean | undefined;
-					printJS?: boolean | undefined;
-					printMetadata?: boolean | undefined;
-					printNamedDests?: boolean | undefined;
-					printRawDates?: boolean | undefined;
-					printUrls?: boolean | undefined;
-					printVersionInfo?: boolean | undefined;
-					userPassword?: string | undefined;
-			  }
-			| undefined
-	): Promise<string>;
+		options?: {
+			firstPageToConvert?: number;
+			lastPageToConvert?: number;
+			listEncodingOptions?: boolean;
+			outputEncoding?: string;
+			ownerPassword?: string;
+			printAsJson?: boolean;
+			printBoundingBoxes?: boolean;
+			printDocStruct?: boolean;
+			printDocStructText?: boolean;
+			printIsoDates?: boolean;
+			printJS?: boolean;
+			printMetadata?: boolean;
+			printNamedDests?: boolean;
+			printRawDates?: boolean;
+			printUrls?: boolean;
+			printVersionInfo?: boolean;
+			userPassword?: string;
+		}
+	): Promise<object | string>;
 	/**
 	 * @author Frazer Smith
 	 * @description Extracts single pages from a PDF file,
@@ -219,13 +208,11 @@ export class Poppler {
 	pdfSeparate(
 		file: string,
 		outputPattern: string,
-		options?:
-			| {
-					firstPageToExtract?: number | undefined;
-					lastPageToExtract?: number | undefined;
-					printVersionInfo?: boolean | undefined;
-			  }
-			| undefined
+		options?: {
+			firstPageToExtract?: number;
+			lastPageToExtract?: number;
+			printVersionInfo?: boolean;
+		}
 	): Promise<string>;
 	/**
 	 * @author Frazer Smith
@@ -334,77 +321,62 @@ export class Poppler {
 	 */
 	pdfToCairo(
 		file: Buffer | string,
-		outputFile?: string | undefined,
-		options?:
-			| {
-					antialias?:
-						| "default"
-						| "none"
-						| "best"
-						| "fast"
-						| "good"
-						| "gray"
-						| "subpixel"
-						| undefined;
-					cropBox?: boolean | undefined;
-					cropHeight?: number | undefined;
-					cropSize?: number | undefined;
-					cropWidth?: number | undefined;
-					cropXAxis?: number | undefined;
-					cropYAxis?: number | undefined;
-					duplex?: boolean | undefined;
-					epsFile?: boolean | undefined;
-					evenPagesOnly?: boolean | undefined;
-					fillPage?: boolean | undefined;
-					firstPageToConvert?: number | undefined;
-					grayscaleFile?: boolean | undefined;
-					iccFile?: string | undefined;
-					jpegFile?: boolean | undefined;
-					jpegOptions?: string | undefined;
-					lastPageToConvert?: number | undefined;
-					monochromeFile?: boolean | undefined;
-					noCenter?: boolean | undefined;
-					noCrop?: boolean | undefined;
-					noShrink?: boolean | undefined;
-					oddPagesOnly?: boolean | undefined;
-					originalPageSizes?: boolean | undefined;
-					ownerPassword?: string | undefined;
-					paperHeight?: number | undefined;
-					paperSize?:
-						| "match"
-						| "A3"
-						| "A4"
-						| "legal"
-						| "letter"
-						| undefined;
-					paperWidth?: number | undefined;
-					pdfFile?: boolean | undefined;
-					pngFile?: boolean | undefined;
-					printVersionInfo?: boolean | undefined;
-					psFile?: boolean | undefined;
-					psLevel2?: boolean | undefined;
-					psLevel3?: boolean | undefined;
-					quiet?: boolean | undefined;
-					resolutionXAxis?: number | undefined;
-					resolutionXYAxis?: number | undefined;
-					resolutionYAxis?: number | undefined;
-					scalePageTo?: number | undefined;
-					scalePageToXAxis?: number | undefined;
-					scalePageToYAxis?: number | undefined;
-					singleFile?: boolean | undefined;
-					svgFile?: boolean | undefined;
-					tiffCompression?:
-						| "none"
-						| "deflate"
-						| "jpeg"
-						| "lzw"
-						| "packbits"
-						| undefined;
-					tiffFile?: boolean | undefined;
-					transparentPageColor?: boolean | undefined;
-					userPassword?: string | undefined;
-			  }
-			| undefined
+		outputFile?: string,
+		options?: {
+			antialias?:
+				| "best"
+				| "default"
+				| "fast"
+				| "good"
+				| "gray"
+				| "none"
+				| "subpixel";
+			cropBox?: boolean;
+			cropHeight?: number;
+			cropSize?: number;
+			cropWidth?: number;
+			cropXAxis?: number;
+			cropYAxis?: number;
+			duplex?: boolean;
+			epsFile?: boolean;
+			evenPagesOnly?: boolean;
+			fillPage?: boolean;
+			firstPageToConvert?: number;
+			grayscaleFile?: boolean;
+			iccFile?: string;
+			jpegFile?: boolean;
+			jpegOptions?: string;
+			lastPageToConvert?: number;
+			monochromeFile?: boolean;
+			noCenter?: boolean;
+			noCrop?: boolean;
+			noShrink?: boolean;
+			oddPagesOnly?: boolean;
+			originalPageSizes?: boolean;
+			ownerPassword?: string;
+			paperHeight?: number;
+			paperSize?: "A3" | "A4" | "legal" | "letter" | "match";
+			paperWidth?: number;
+			pdfFile?: boolean;
+			pngFile?: boolean;
+			printVersionInfo?: boolean;
+			psFile?: boolean;
+			psLevel2?: boolean;
+			psLevel3?: boolean;
+			quiet?: boolean;
+			resolutionXAxis?: number;
+			resolutionXYAxis?: number;
+			resolutionYAxis?: number;
+			scalePageTo?: number;
+			scalePageToXAxis?: number;
+			scalePageToYAxis?: number;
+			singleFile?: boolean;
+			svgFile?: boolean;
+			tiffCompression?: "deflate" | "jpeg" | "lzw" | "none" | "packbits";
+			tiffFile?: boolean;
+			transparentPageColor?: boolean;
+			userPassword?: string;
+		}
 	): Promise<string>;
 	/**
 	 * @author Frazer Smith
@@ -448,34 +420,32 @@ export class Poppler {
 	 */
 	pdfToHtml(
 		file: Buffer | string,
-		outputFile?: string | undefined,
-		options?:
-			| {
-					complexOutput?: boolean | undefined;
-					dataUrls?: boolean | undefined;
-					exchangePdfLinks?: boolean | undefined;
-					extractHidden?: boolean | undefined;
-					firstPageToConvert?: number | undefined;
-					fontFullName?: boolean | undefined;
-					ignoreImages?: boolean | undefined;
-					imageFormat?: "JPG" | "PNG" | undefined;
-					lastPageToConvert?: number | undefined;
-					noDrm?: boolean | undefined;
-					noFrames?: boolean | undefined;
-					noMergeParagraph?: boolean | undefined;
-					noRoundedCoordinates?: boolean | undefined;
-					outputEncoding?: string | undefined;
-					ownerPassword?: string | undefined;
-					printVersionInfo?: boolean | undefined;
-					quiet?: boolean | undefined;
-					singlePage?: boolean | undefined;
-					stdout?: boolean | undefined;
-					userPassword?: string | undefined;
-					wordBreakThreshold?: number | undefined;
-					xmlOutput?: boolean | undefined;
-					zoom?: number | undefined;
-			  }
-			| undefined
+		outputFile?: string,
+		options?: {
+			complexOutput?: boolean;
+			dataUrls?: boolean;
+			exchangePdfLinks?: boolean;
+			extractHidden?: boolean;
+			firstPageToConvert?: number;
+			fontFullName?: boolean;
+			ignoreImages?: boolean;
+			imageFormat?: "JPG" | "PNG";
+			lastPageToConvert?: number;
+			noDrm?: boolean;
+			noFrames?: boolean;
+			noMergeParagraph?: boolean;
+			noRoundedCoordinates?: boolean;
+			outputEncoding?: string;
+			ownerPassword?: string;
+			printVersionInfo?: boolean;
+			quiet?: boolean;
+			singlePage?: boolean;
+			stdout?: boolean;
+			userPassword?: string;
+			wordBreakThreshold?: number;
+			xmlOutput?: boolean;
+			zoom?: number;
+		}
 	): Promise<string>;
 	/**
 	 * @author Frazer Smith
@@ -554,55 +524,47 @@ export class Poppler {
 	pdfToPpm(
 		file: Buffer | string,
 		outputPath: string,
-		options?:
-			| {
-					antialiasFonts?: "no" | "yes" | undefined;
-					antialiasVectors?: "no" | "yes" | undefined;
-					cropBox?: boolean | undefined;
-					cropHeight?: number | undefined;
-					cropSize?: number | undefined;
-					cropWidth?: number | undefined;
-					cropXAxis?: number | undefined;
-					cropYAxis?: number | undefined;
-					defaultCmykProfile?: string | undefined;
-					defaultGrayProfile?: string | undefined;
-					defaultRgbProfile?: string | undefined;
-					displayProfile?: string | undefined;
-					evenPagesOnly?: boolean | undefined;
-					firstPageToConvert?: number | undefined;
-					freetype?: "no" | "yes" | undefined;
-					forcePageNumber?: boolean | undefined;
-					grayscaleFile?: boolean | undefined;
-					hideAnnotations?: boolean | undefined;
-					jpegFile?: boolean | undefined;
-					lastPageToConvert?: number | undefined;
-					monochromeFile?: boolean | undefined;
-					oddPagesOnly?: boolean | undefined;
-					ownerPassword?: string | undefined;
-					pngFile?: boolean | undefined;
-					printProgress?: boolean | undefined;
-					printVersionInfo?: boolean | undefined;
-					quiet?: boolean | undefined;
-					resolutionXAxis?: number | undefined;
-					resolutionXYAxis?: number | undefined;
-					resolutionYAxis?: number | undefined;
-					scalePageTo?: number | undefined;
-					scalePageToXAxis?: number | undefined;
-					scalePageToYAxis?: number | undefined;
-					separator?: string | undefined;
-					singleFile?: boolean | undefined;
-					thinLineMode?: "none" | "shape" | "solid" | undefined;
-					tiffCompression?:
-						| "none"
-						| "deflate"
-						| "jpeg"
-						| "lzw"
-						| "packbits"
-						| undefined;
-					tiffFile?: boolean | undefined;
-					userPassword?: string | undefined;
-			  }
-			| undefined
+		options?: {
+			antialiasFonts?: "no" | "yes";
+			antialiasVectors?: "no" | "yes";
+			cropBox?: boolean;
+			cropHeight?: number;
+			cropSize?: number;
+			cropWidth?: number;
+			cropXAxis?: number;
+			cropYAxis?: number;
+			defaultCmykProfile?: string;
+			defaultGrayProfile?: string;
+			defaultRgbProfile?: string;
+			displayProfile?: string;
+			evenPagesOnly?: boolean;
+			firstPageToConvert?: number;
+			freetype?: "no" | "yes";
+			forcePageNumber?: boolean;
+			grayscaleFile?: boolean;
+			hideAnnotations?: boolean;
+			jpegFile?: boolean;
+			lastPageToConvert?: number;
+			monochromeFile?: boolean;
+			oddPagesOnly?: boolean;
+			ownerPassword?: string;
+			pngFile?: boolean;
+			printProgress?: boolean;
+			printVersionInfo?: boolean;
+			quiet?: boolean;
+			resolutionXAxis?: number;
+			resolutionXYAxis?: number;
+			resolutionYAxis?: number;
+			scalePageTo?: number;
+			scalePageToXAxis?: number;
+			scalePageToYAxis?: number;
+			separator?: string;
+			singleFile?: boolean;
+			thinLineMode?: "none" | "shape" | "solid";
+			tiffCompression?: "deflate" | "jpeg" | "lzw" | "none" | "packbits";
+			tiffFile?: boolean;
+			userPassword?: string;
+		}
 	): Promise<string>;
 	/**
 	 * @author Frazer Smith
@@ -715,58 +677,50 @@ export class Poppler {
 	 */
 	pdfToPs(
 		file: Buffer | string,
-		outputFile?: string | undefined,
-		options?:
-			| {
-					antialias?: "no" | "yes" | undefined;
-					binary?: boolean | undefined;
-					defaultCmykProfile?: string | undefined;
-					defaultGrayProfile?: string | undefined;
-					defaultRgbProfile?: string | undefined;
-					duplex?: boolean | undefined;
-					epsFile?: boolean | undefined;
-					fillPage?: boolean | undefined;
-					firstPageToConvert?: number | undefined;
-					form?: number | undefined;
-					lastPageToConvert?: number | undefined;
-					level1?: boolean | undefined;
-					level1Sep?: boolean | undefined;
-					level2?: boolean | undefined;
-					level2Sep?: boolean | undefined;
-					level3?: boolean | undefined;
-					level3Sep?: boolean | undefined;
-					noEmbedCIDFonts?: boolean | undefined;
-					noEmbedCIDTrueTypeFonts?: boolean | undefined;
-					noEmbedTrueTypeFonts?: boolean | undefined;
-					noEmbedType1Fonts?: boolean | undefined;
-					noCenter?: boolean | undefined;
-					noCrop?: boolean | undefined;
-					noShrink?: boolean | undefined;
-					opi?: boolean | undefined;
-					optimizecolorspace?: boolean | undefined;
-					originalPageSizes?: boolean | undefined;
-					overprint?: boolean | undefined;
-					ownerPassword?: string | undefined;
-					paperHeight?: number | undefined;
-					paperSize?:
-						| "match"
-						| "A3"
-						| "A4"
-						| "legal"
-						| "letter"
-						| undefined;
-					paperWidth?: number | undefined;
-					passfonts?: boolean | undefined;
-					preload?: boolean | undefined;
-					printVersionInfo?: boolean | undefined;
-					processColorFormat?: "CMYK8" | "MONO8" | "RGB8" | undefined;
-					processColorProfile?: string | undefined;
-					quiet?: boolean | undefined;
-					rasterize?: "always" | "never" | "whenneeded" | undefined;
-					resolutionXYAxis?: number | undefined;
-					userPassword?: string | undefined;
-			  }
-			| undefined
+		outputFile?: string,
+		options?: {
+			antialias?: "no" | "yes";
+			binary?: boolean;
+			defaultCmykProfile?: string;
+			defaultGrayProfile?: string;
+			defaultRgbProfile?: string;
+			duplex?: boolean;
+			epsFile?: boolean;
+			fillPage?: boolean;
+			firstPageToConvert?: number;
+			form?: number;
+			lastPageToConvert?: number;
+			level1?: boolean;
+			level1Sep?: boolean;
+			level2?: boolean;
+			level2Sep?: boolean;
+			level3?: boolean;
+			level3Sep?: boolean;
+			noEmbedCIDFonts?: boolean;
+			noEmbedCIDTrueTypeFonts?: boolean;
+			noEmbedTrueTypeFonts?: boolean;
+			noEmbedType1Fonts?: boolean;
+			noCenter?: boolean;
+			noCrop?: boolean;
+			noShrink?: boolean;
+			opi?: boolean;
+			optimizecolorspace?: boolean;
+			originalPageSizes?: boolean;
+			overprint?: boolean;
+			ownerPassword?: string;
+			paperHeight?: number;
+			paperSize?: "A3" | "A4" | "legal" | "letter" | "match";
+			paperWidth?: number;
+			passfonts?: boolean;
+			preload?: boolean;
+			printVersionInfo?: boolean;
+			processColorFormat?: "CMYK8" | "MONO8" | "RGB8";
+			processColorProfile?: string;
+			quiet?: boolean;
+			rasterize?: "always" | "never" | "whenneeded";
+			resolutionXYAxis?: number;
+			userPassword?: string;
+		}
 	): Promise<string>;
 	/**
 	 * @author Frazer Smith
@@ -818,34 +772,32 @@ export class Poppler {
 	 */
 	pdfToText(
 		file: Buffer | string,
-		outputFile?: string | undefined,
-		options?:
-			| {
-					boundingBoxXhtml?: boolean | undefined;
-					boundingBoxXhtmlLayout?: boolean | undefined;
-					cropBox?: boolean | undefined;
-					cropHeight?: number | undefined;
-					cropWidth?: number | undefined;
-					cropXAxis?: number | undefined;
-					cropYAxis?: number | undefined;
-					eolConvention?: "dos" | "mac" | "unix" | undefined;
-					firstPageToConvert?: number | undefined;
-					fixedWidthLayout?: number | undefined;
-					generateHtmlMetaFile?: boolean | undefined;
-					generateTsvFile?: boolean | undefined;
-					lastPageToConvert?: number | undefined;
-					listEncodingOptions?: boolean | undefined;
-					maintainLayout?: boolean | undefined;
-					noDiagonalText?: boolean | undefined;
-					noPageBreaks?: boolean | undefined;
-					outputEncoding?: string | undefined;
-					ownerPassword?: string | undefined;
-					printVersionInfo?: boolean | undefined;
-					quiet?: boolean | undefined;
-					rawLayout?: boolean | undefined;
-					userPassword?: string | undefined;
-			  }
-			| undefined
+		outputFile?: string,
+		options?: {
+			boundingBoxXhtml?: boolean;
+			boundingBoxXhtmlLayout?: boolean;
+			cropBox?: boolean;
+			cropHeight?: number;
+			cropWidth?: number;
+			cropXAxis?: number;
+			cropYAxis?: number;
+			eolConvention?: "dos" | "mac" | "unix";
+			firstPageToConvert?: number;
+			fixedWidthLayout?: number;
+			generateHtmlMetaFile?: boolean;
+			generateTsvFile?: boolean;
+			lastPageToConvert?: number;
+			listEncodingOptions?: boolean;
+			maintainLayout?: boolean;
+			noDiagonalText?: boolean;
+			noPageBreaks?: boolean;
+			outputEncoding?: string;
+			ownerPassword?: string;
+			printVersionInfo?: boolean;
+			quiet?: boolean;
+			rawLayout?: boolean;
+			userPassword?: string;
+		}
 	): Promise<string>;
 	/**
 	 * @author Frazer Smith
@@ -861,10 +813,8 @@ export class Poppler {
 	pdfUnite(
 		files: string[],
 		outputFile: string,
-		options?:
-			| {
-					printVersionInfo?: boolean | undefined;
-			  }
-			| undefined
+		options?: {
+			printVersionInfo?: boolean;
+		}
 	): Promise<string>;
 }