node-poppler 6.1.0 → 6.1.1

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Frazer Smith
+Copyright (c) 2019-2023 Frazer Smith
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/README.md

@@ -45,7 +45,7 @@ Once they have been installed, you will need to pass the `poppler-utils` install
 
 ```js
 const { Poppler } = require("node-poppler");
-const poppler = new Poppler("./usr/bin");
+const poppler = new Poppler("/usr/bin");
 ```
 
 ## API

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "node-poppler",
-	"version": "6.1.0",
+	"version": "6.1.1",
 	"description": "Asynchronous node.js wrapper for the Poppler PDF rendering library",
 	"keywords": [
 		"async",

package/src/index.js

@@ -22,51 +22,48 @@ const errorMessages = {
  * @param {object} acceptedOptions - Object containing options that a binary accepts.
  * @param {object} options - Object containing options to pass to binary.
  * @param {string=} version - Version of binary.
- * @returns {Promise<Array|Error>} Promise of array of CLI arguments on resolve, or Error object on rejection.
+ * @returns {Array|Error} Array of CLI arguments or Error object if invalid arguments provided.
  */
 function parseOptions(acceptedOptions, options, version) {
-	return new Promise((resolve, reject) => {
-		const args = [];
-		const invalidArgs = [];
-		Object.keys(options).forEach((key) => {
-			if (Object.prototype.hasOwnProperty.call(acceptedOptions, key)) {
-				// eslint-disable-next-line valid-typeof
-				if (typeof options[key] === acceptedOptions[key].type) {
-					// Arg will be empty for some non-standard options
-					if (acceptedOptions[key].arg !== "") {
-						args.push(acceptedOptions[key].arg);
-					}
-
-					if (typeof options[key] !== "boolean") {
-						args.push(options[key]);
-					}
-				} else {
-					invalidArgs.push(
-						`Invalid value type provided for option '${key}', expected ${
-							acceptedOptions[key].type
-						} but received ${typeof options[key]}`
-					);
+	const args = [];
+	const invalidArgs = [];
+	Object.keys(options).forEach((key) => {
+		if (Object.prototype.hasOwnProperty.call(acceptedOptions, key)) {
+			// eslint-disable-next-line valid-typeof
+			if (typeof options[key] === acceptedOptions[key].type) {
+				// Arg will be empty for some non-standard options
+				if (acceptedOptions[key].arg !== "") {
+					args.push(acceptedOptions[key].arg);
 				}
 
-				if (
-					acceptedOptions[key].minVersion &&
-					version &&
-					version < acceptedOptions[key].minVersion
-				) {
-					invalidArgs.push(
-						`Invalid option provided for the current version of the binary used. '${key}' was introduced in v${acceptedOptions[key].minVersion}, but received v${version}`
-					);
+				if (typeof options[key] !== "boolean") {
+					args.push(options[key]);
 				}
 			} else {
-				invalidArgs.push(`Invalid option provided '${key}'`);
+				invalidArgs.push(
+					`Invalid value type provided for option '${key}', expected ${
+						acceptedOptions[key].type
+					} but received ${typeof options[key]}`
+				);
+			}
+
+			if (
+				acceptedOptions[key].minVersion &&
+				version &&
+				version < acceptedOptions[key].minVersion
+			) {
+				invalidArgs.push(
+					`Invalid option provided for the current version of the binary used. '${key}' was introduced in v${acceptedOptions[key].minVersion}, but received v${version}`
+				);
 			}
-		});
-		if (invalidArgs.length === 0) {
-			resolve(args);
 		} else {
-			reject(new Error(invalidArgs.join("; ")));
+			invalidArgs.push(`Invalid option provided '${key}'`);
 		}
 	});
+	if (invalidArgs.length === 0) {
+		return args;
+	}
+	throw new Error(invalidArgs.join("; "));
 }
 
 class Poppler {
@@ -81,7 +78,7 @@ class Poppler {
 				__dirname,
 				"lib",
 				"win32",
-				"poppler-22.11.0",
+				"poppler-23.01.0",
 				"Library",
 				"bin"
 			);
@@ -110,7 +107,7 @@ class Poppler {
 		};
 
 		try {
-			const args = await parseOptions(acceptedOptions, options);
+			const args = parseOptions(acceptedOptions, options);
 			args.push(file);
 			args.push(fileToAttach);
 			args.push(outputFile);
@@ -169,7 +166,7 @@ class Poppler {
 		};
 
 		try {
-			const args = await parseOptions(acceptedOptions, options);
+			const args = parseOptions(acceptedOptions, options);
 			args.push(file);
 
 			const { stdout } = await execFileAsync(
@@ -214,11 +211,7 @@ class Poppler {
 
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/i.exec(stderr)[1];
 
-			const args = await parseOptions(
-				acceptedOptions,
-				options,
-				versionInfo
-			);
+			const args = parseOptions(acceptedOptions, options, versionInfo);
 
 			return new Promise((resolve, reject) => {
 				if (Buffer.isBuffer(file)) {
@@ -310,11 +303,7 @@ class Poppler {
 
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/i.exec(stderr)[1];
 
-			const args = await parseOptions(
-				acceptedOptions,
-				options,
-				versionInfo
-			);
+			const args = parseOptions(acceptedOptions, options, versionInfo);
 
 			return new Promise((resolve, reject) => {
 				if (Buffer.isBuffer(file)) {
@@ -429,11 +418,7 @@ class Poppler {
 
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/i.exec(stderr)[1];
 
-			const args = await parseOptions(
-				acceptedOptions,
-				options,
-				versionInfo
-			);
+			const args = parseOptions(acceptedOptions, options, versionInfo);
 
 			/**
 			 * Poppler does not set the "File size" metadata value if passed
@@ -537,11 +522,7 @@ class Poppler {
 
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/i.exec(stderr)[1];
 
-			const args = await parseOptions(
-				acceptedOptions,
-				options,
-				versionInfo
-			);
+			const args = parseOptions(acceptedOptions, options, versionInfo);
 			args.push(file);
 			args.push(outputPattern);
 
@@ -718,11 +699,7 @@ class Poppler {
 
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/i.exec(stderr)[1];
 
-			const args = await parseOptions(
-				acceptedOptions,
-				options,
-				versionInfo
-			);
+			const args = parseOptions(acceptedOptions, options, versionInfo);
 
 			return new Promise((resolve, reject) => {
 				if (Buffer.isBuffer(file)) {
@@ -862,11 +839,7 @@ class Poppler {
 
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/i.exec(stderr)[1];
 
-			const args = await parseOptions(
-				acceptedOptions,
-				options,
-				versionInfo
-			);
+			const args = parseOptions(acceptedOptions, options, versionInfo);
 
 			return new Promise((resolve, reject) => {
 				if (Buffer.isBuffer(file)) {
@@ -1071,11 +1044,7 @@ class Poppler {
 
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/i.exec(stderr)[1];
 
-			const args = await parseOptions(
-				acceptedOptions,
-				options,
-				versionInfo
-			);
+			const args = parseOptions(acceptedOptions, options, versionInfo);
 
 			return new Promise((resolve, reject) => {
 				if (Buffer.isBuffer(file)) {
@@ -1305,11 +1274,7 @@ class Poppler {
 
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/i.exec(stderr)[1];
 
-			const args = await parseOptions(
-				acceptedOptions,
-				options,
-				versionInfo
-			);
+			const args = parseOptions(acceptedOptions, options, versionInfo);
 
 			return new Promise((resolve, reject) => {
 				if (Buffer.isBuffer(file)) {
@@ -1458,11 +1423,7 @@ class Poppler {
 
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/i.exec(stderr)[1];
 
-			const args = await parseOptions(
-				acceptedOptions,
-				options,
-				versionInfo
-			);
+			const args = parseOptions(acceptedOptions, options, versionInfo);
 
 			return new Promise((resolve, reject) => {
 				if (Buffer.isBuffer(file)) {
@@ -1540,11 +1501,7 @@ class Poppler {
 
 			const versionInfo = /(\d{1,2}\.\d{1,2}\.\d{1,2})/i.exec(stderr)[1];
 
-			const args = await parseOptions(
-				acceptedOptions,
-				options,
-				versionInfo
-			);
+			const args = parseOptions(acceptedOptions, options, versionInfo);
 			files.forEach((element) => {
 				args.push(element);
 			});