node-poppler 5.1.0 → 5.1.3

package/CHANGELOG.md

@@ -2,6 +2,101 @@
 
 All notable changes to this project will be documented in this file.
 
+### [5.1.3](https://github.com/Fdawgs/node-poppler/compare/v5.1.2...v5.1.3) (2022-02-25)
+
+
+### Bug Fixes
+
+* **index:** use `spawn` for larger stream results ([#386](https://github.com/Fdawgs/node-poppler/issues/386)) ([e437f3e](https://github.com/Fdawgs/node-poppler/commit/e437f3e9e9fa73a8e36d64a01283388e3a879e10))
+
+
+### Miscellaneous
+
+* **.github:** remove trailing whitespace ([aee8872](https://github.com/Fdawgs/node-poppler/commit/aee8872c62b5f66e83d75915a325be6bfd32ee76))
+
+
+### Dependencies
+
+* **dependabot:** ignore minor and patch commit-lint updates ([#380](https://github.com/Fdawgs/node-poppler/issues/380)) ([b5ff45f](https://github.com/Fdawgs/node-poppler/commit/b5ff45f603697b66155d488579c47dee34ad5f2f))
+* **dependabot:** major tags no longer need ignore support ([579cea2](https://github.com/Fdawgs/node-poppler/commit/579cea2c0e36d200fb5981529b0fb092e99d6c67))
+* **dependabot:** use default open-pull-requests-limit value ([eebb453](https://github.com/Fdawgs/node-poppler/commit/eebb4537a299fa6d2a01c2621db619d298c933cc))
+* **deps-dev:** bump dev dependencies ([#388](https://github.com/Fdawgs/node-poppler/issues/388)) ([06f8957](https://github.com/Fdawgs/node-poppler/commit/06f895771c639ea06f2dbeb0a61c180a3ec650b3))
+* **deps-dev:** bump eslint-plugin-jest from 25.7.0 to 26.0.0 ([321e7d0](https://github.com/Fdawgs/node-poppler/commit/321e7d0221d67be7ccf2ab12bbbb95d20c96a7a3))
+* **deps:** bump actions/github-script from 5 to 6 ([deb69a6](https://github.com/Fdawgs/node-poppler/commit/deb69a6ac7244ece7c87e3f5f02965f7d33e2c08))
+* **deps:** bump actions/setup-node from 2 to 3 ([81f52ca](https://github.com/Fdawgs/node-poppler/commit/81f52ca1f885b332e2f12be6d445418e148d9051))
+
+### [5.1.2](https://github.com/Fdawgs/node-poppler/compare/v5.1.1...v5.1.2) (2022-01-19)
+
+
+### Bug Fixes
+
+* **lib:** update poppler win32 binaries from 21.11.0 to 22.01.0 ([e76a813](https://github.com/Fdawgs/node-poppler/commit/e76a813b3ad12bb15a808ccd4d1a163016d36eec))
+
+
+### Miscellaneous
+
+* **package:** add `tif` to keywords array ([#369](https://github.com/Fdawgs/node-poppler/issues/369)) ([2929483](https://github.com/Fdawgs/node-poppler/commit/29294830056f6e8f53c82822560b840d2031f3b6))
+
+
+### Documentation
+
+* **contributing:** add mention of husky pre-commit hook ([8eb63e8](https://github.com/Fdawgs/node-poppler/commit/8eb63e8d0dac69bce76fda5032506a5171abf3e4))
+* **contributing:** add step for `lint:licenses` script ([#371](https://github.com/Fdawgs/node-poppler/issues/371)) ([5e9f7a5](https://github.com/Fdawgs/node-poppler/commit/5e9f7a510f6aa407d39a17ad24d83ade59c98f41))
+
+
+### Continuous Integration
+
+* remove spellcheck workflow ([#376](https://github.com/Fdawgs/node-poppler/issues/376)) ([56fb637](https://github.com/Fdawgs/node-poppler/commit/56fb63713171c4aed9458d48b4d2cf66a5b91419))
+
+
+### Dependencies
+
+* **deps-dev:** bump @commitlint/cli from 15.0.0 to 16.0.1 ([8ab463a](https://github.com/Fdawgs/node-poppler/commit/8ab463aa30b8bc1fd36ed40c4595f2d274d90674))
+* **deps-dev:** bump @commitlint/config-conventional ([6cda233](https://github.com/Fdawgs/node-poppler/commit/6cda233e5a29e44961c2e52d2a19d01b008e9ddc))
+* **deps-dev:** bump eslint from 7.32.0 to 8.7.0 ([73a77a5](https://github.com/Fdawgs/node-poppler/commit/73a77a5bdd250e19086ef9bd838f74b5fec2ef81))
+* **deps-dev:** bump eslint-plugin-promise from 5.2.0 to 6.0.0 ([535feb0](https://github.com/Fdawgs/node-poppler/commit/535feb08ba673a0a6812e5a3d8a4bf0e2af518f3))
+* **deps:** bump GoogleCloudPlatform/release-please-action from 2 to 3 ([e3c9d8e](https://github.com/Fdawgs/node-poppler/commit/e3c9d8e76c34d949f6d98e60a57f19dcff90a766))
+* update dependencies ([db8a76d](https://github.com/Fdawgs/node-poppler/commit/db8a76d498760e808544026183e9aade29b4c4d8))
+
+### [5.1.1](https://www.github.com/Fdawgs/node-poppler/compare/v5.1.0...v5.1.1) (2021-12-11)
+
+
+### Bug Fixes
+
+* **index:** correct message thrown for missing binaries ([#363](https://www.github.com/Fdawgs/node-poppler/issues/363)) ([5249d61](https://www.github.com/Fdawgs/node-poppler/commit/5249d6183b11f6c9eded643359e05d4f3ecf9f01))
+
+
+### Continuous Integration
+
+* trigger workflows when drafts marked as "ready to review" ([#354](https://www.github.com/Fdawgs/node-poppler/issues/354)) ([de922a2](https://www.github.com/Fdawgs/node-poppler/commit/de922a20494d8bc87333da156248342805e37a15))
+
+
+### Documentation
+
+* **coc:** reduce verbosity ([b38d954](https://www.github.com/Fdawgs/node-poppler/commit/b38d9549a890e434868cc26a59867a26a49b8167))
+
+
+### Improvements
+
+* **index:** remove unused `if` conditional ([d56589d](https://www.github.com/Fdawgs/node-poppler/commit/d56589d41caa60533718bee24eb5797aec0f40eb))
+
+
+### Miscellaneous
+
+* ignore `.yarnclean` ([#360](https://www.github.com/Fdawgs/node-poppler/issues/360)) ([196b528](https://www.github.com/Fdawgs/node-poppler/commit/196b528c860bd0bd191e1dbc53c1dfc2867aa334))
+* **package/scripts:** add `lint:licenses` ([#361](https://www.github.com/Fdawgs/node-poppler/issues/361)) ([a010434](https://www.github.com/Fdawgs/node-poppler/commit/a0104344c0569887e3af82263aa091cde0027afc))
+* turn off `security/detect-object-injection` eslint rule ([1d6dc35](https://www.github.com/Fdawgs/node-poppler/commit/1d6dc35bfe4c0e54391745a3ff45485b0c76fac0))
+
+
+### Dependencies
+
+* **dependabot:** ignore minor and patch github-actions updates ([#356](https://www.github.com/Fdawgs/node-poppler/issues/356)) ([56d1a86](https://www.github.com/Fdawgs/node-poppler/commit/56d1a86e20681a8b747da0713176522be7de258e))
+* **dependabot:** ignore minor and patch release-please-action updates ([#367](https://www.github.com/Fdawgs/node-poppler/issues/367)) ([b77729f](https://www.github.com/Fdawgs/node-poppler/commit/b77729f4764f7536fda9ead8cac0b08dc75b269a))
+* **deps-dev:** bump @commitlint/cli from 14.1.0 to 15.0.0 ([08d87b5](https://www.github.com/Fdawgs/node-poppler/commit/08d87b55891b56d81fe73db9db1a0b0eb98b9d17))
+* **deps-dev:** bump @commitlint/config-conventional ([c5452ee](https://www.github.com/Fdawgs/node-poppler/commit/c5452eef69ef09503ee7a357f09595c8526a2e0a))
+* **deps-dev:** bump prettier from 2.4.1 to 2.5.0 ([74f9e90](https://www.github.com/Fdawgs/node-poppler/commit/74f9e907ef9cdabb039463845055316d42a21ad5))
+* **deps-dev:** bump prettier from 2.5.0 to 2.5.1 ([d51ca9b](https://www.github.com/Fdawgs/node-poppler/commit/d51ca9b64884715b47eed2db64229b84c9dd9f4a))
+
 ## [5.1.0](https://www.github.com/Fdawgs/node-poppler/compare/v5.0.3...v5.1.0) (2021-11-10)
 
 

package/package.json

@@ -1,94 +1,97 @@
 {
-  "name": "node-poppler",
-  "version": "5.1.0",
-  "description": "Asynchronous node.js wrapper for the Poppler PDF rendering library",
-  "keywords": [
-    "async",
-    "attach",
-    "cairo",
-    "converter",
-    "detach",
-    "eps",
-    "html",
-    "jpg",
-    "jpeg",
-    "pdf",
-    "pdf-converter",
-    "pdf-to-cairo",
-    "pdf-to-html",
-    "pdf-to-image",
-    "pdf-to-ppm",
-    "pdf-to-ps",
-    "pdf-to-text",
-    "png",
-    "poppler",
-    "ppm",
-    "ps",
-    "separate",
-    "svg",
-    "text",
-    "tiff",
-    "txt",
-    "unite"
-  ],
-  "main": "src/index.js",
-  "repository": "git+https://github.com/Fdawgs/node-poppler.git",
-  "homepage": "https://github.com/Fdawgs/node-poppler",
-  "bugs": {
-    "url": "https://github.com/Fdawgs/node-poppler/issues"
-  },
-  "license": "MIT",
-  "author": "Frazer Smith <frazer.dev@outlook.com>",
-  "engines": {
-    "node": ">=12.0.0"
-  },
-  "scripts": {
-    "build": "tsc",
-    "doc": "tsc && jsdoc2md src/index.js > API.md && npm run lint:prettier",
-    "jest": "jest --detectOpenHandles --runInBand",
-    "jest:coverage": "jest --coverage --runInBand",
-    "lint": "eslint . --cache --ext js,jsx --ignore-path .gitignore",
-    "lint:prettier": "prettier . --write --ignore-unknown",
-    "lint:prettier:ci": "prettier . --check --ignore-unknown",
-    "prepare": "",
-    "test": "npm run lint && npm run jest"
-  },
-  "commitlint": {
-    "extends": [
-      "@commitlint/config-conventional"
-    ]
-  },
-  "jest": {
-    "clearMocks": true,
-    "coverageReporters": [
-      "text",
-      "lcovonly"
-    ],
-    "resetMocks": true,
-    "testEnvironment": "node",
-    "testTimeout": 60000
-  },
-  "devDependencies": {
-    "@commitlint/cli": "^14.1.0",
-    "@commitlint/config-conventional": "^14.1.0",
-    "eslint": "^7.32.0",
-    "eslint-config-airbnb-base": "^15.0.0",
-    "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.25.3",
-    "eslint-plugin-jest": "^25.2.4",
-    "eslint-plugin-jsdoc": "^37.0.3",
-    "eslint-plugin-promise": "^5.1.1",
-    "eslint-plugin-security": "^1.4.0",
-    "eslint-plugin-security-node": "^1.0.14",
-    "glob": "^7.2.0",
-    "husky": "^7.0.4",
-    "jest": "^27.3.1",
-    "jsdoc-to-markdown": "^7.1.0",
-    "prettier": "2.4.1",
-    "typescript": "^4.4.4"
-  },
-  "dependencies": {
-    "camelcase": "^6.2.0",
-    "upath": "^2.0.1"
-  }
+	"name": "node-poppler",
+	"version": "5.1.3",
+	"description": "Asynchronous node.js wrapper for the Poppler PDF rendering library",
+	"keywords": [
+		"async",
+		"attach",
+		"cairo",
+		"converter",
+		"detach",
+		"eps",
+		"html",
+		"jpg",
+		"jpeg",
+		"pdf",
+		"pdf-converter",
+		"pdf-to-cairo",
+		"pdf-to-html",
+		"pdf-to-image",
+		"pdf-to-ppm",
+		"pdf-to-ps",
+		"pdf-to-text",
+		"png",
+		"poppler",
+		"ppm",
+		"ps",
+		"separate",
+		"svg",
+		"text",
+		"tif",
+		"tiff",
+		"txt",
+		"unite"
+	],
+	"main": "src/index.js",
+	"repository": "git+https://github.com/Fdawgs/node-poppler.git",
+	"homepage": "https://github.com/Fdawgs/node-poppler",
+	"bugs": {
+		"url": "https://github.com/Fdawgs/node-poppler/issues"
+	},
+	"license": "MIT",
+	"author": "Frazer Smith <frazer.dev@outlook.com>",
+	"engines": {
+		"node": ">=12.0.0"
+	},
+	"scripts": {
+		"build": "tsc",
+		"doc": "tsc && jsdoc2md src/index.js > API.md && npm run lint:prettier",
+		"jest": "jest --detectOpenHandles --runInBand",
+		"jest:coverage": "jest --coverage --runInBand",
+		"lint": "eslint . --cache --ext js,jsx --ignore-path .gitignore",
+		"lint:licenses": "license-checker --direct --onlyAllow=\"0BSD;Apache-2.0;BSD-2-Clause;BSD-3-Clause;ISC;MIT;Unlicense\" --production --summary",
+		"lint:prettier": "prettier . --write --ignore-unknown",
+		"lint:prettier:ci": "prettier . --check --ignore-unknown",
+		"prepare": "",
+		"test": "npm run lint && npm run jest"
+	},
+	"commitlint": {
+		"extends": [
+			"@commitlint/config-conventional"
+		]
+	},
+	"jest": {
+		"clearMocks": true,
+		"coverageReporters": [
+			"text",
+			"lcovonly"
+		],
+		"resetMocks": true,
+		"testEnvironment": "node",
+		"testTimeout": 60000
+	},
+	"devDependencies": {
+		"@commitlint/cli": "^16.2.1",
+		"@commitlint/config-conventional": "^16.2.1",
+		"eslint": "^8.9.0",
+		"eslint-config-airbnb-base": "^15.0.0",
+		"eslint-config-prettier": "^8.4.0",
+		"eslint-plugin-import": "^2.25.4",
+		"eslint-plugin-jest": "^26.1.1",
+		"eslint-plugin-jsdoc": "^37.9.4",
+		"eslint-plugin-promise": "^6.0.0",
+		"eslint-plugin-security": "^1.4.0",
+		"eslint-plugin-security-node": "^1.1.1",
+		"glob": "^7.2.0",
+		"husky": "^7.0.4",
+		"jest": "^27.5.1",
+		"jsdoc-to-markdown": "^7.1.1",
+		"license-checker": "^25.0.1",
+		"prettier": "^2.5.1",
+		"typescript": "^4.5.5"
+	},
+	"dependencies": {
+		"camelcase": "^6.3.0",
+		"upath": "^2.0.1"
+	}
 }

package/src/index.js

@@ -1,12 +1,10 @@
 /* eslint-disable security/detect-child-process */
 const camelCase = require("camelcase");
-const os = require("os");
 const path = require("upath");
-const { execFile } = require("child_process");
+const { execFile, spawn } = require("child_process");
 const util = require("util");
 
 const execFileAsync = util.promisify(execFile);
-const platform = os.platform();
 
 const errorMessages = {
 	0: "No Error",
@@ -59,16 +57,6 @@ function parseOptions(acceptedOptions, options, version) {
 						`Invalid option provided for the current version of the binary used. '${key}' was introduced in v${acceptedOptions[key].minVersion}, but received v${version}`
 					);
 				}
-
-				if (
-					acceptedOptions[key].maxVersion &&
-					version &&
-					version > acceptedOptions[key].maxVersion
-				) {
-					invalidArgs.push(
-						`Invalid option provided for the current version of the binary used. '${key}' is only present up to v${acceptedOptions[key].maxVersion}, but received v${version}`
-					);
-				}
 			} else {
 				invalidArgs.push(`Invalid option provided '${key}'`);
 			}
@@ -89,27 +77,19 @@ class Poppler {
 	constructor(binPath) {
 		if (binPath) {
 			this.popplerPath = path.normalizeTrim(binPath);
+		} else if (process.platform === "win32") {
+			this.popplerPath = path.joinSafe(
+				__dirname,
+				"lib",
+				"win32",
+				"poppler-22.01.0",
+				"Library",
+				"bin"
+			);
 		} else {
-			let popplerPath;
-
-			// Build path to Poppler binaries based on OS
-			switch (platform) {
-				// Windows OS
-				case "win32":
-					popplerPath = path.joinSafe(
-						__dirname,
-						"lib",
-						"win32",
-						"poppler-21.11.0",
-						"Library",
-						"bin"
-					);
-					break;
-				default:
-					throw new Error(`${platform} is NOT supported.`);
-			}
-
-			this.popplerPath = popplerPath;
+			throw new Error(
+				`${process.platform} poppler-util binaries are not provided, please pass the installation directory as a parameter to the Poppler instance.`
+			);
 		}
 	}
 
@@ -250,7 +230,7 @@ class Poppler {
 					args.push(file);
 				}
 
-				const child = execFile(
+				const child = spawn(
 					path.joinSafe(this.popplerPath, "pdffonts"),
 					args
 				);
@@ -351,7 +331,7 @@ class Poppler {
 					args.push(outputPrefix);
 				}
 
-				const child = execFile(
+				const child = spawn(
 					path.joinSafe(this.popplerPath, "pdfimages"),
 					args
 				);
@@ -380,6 +360,7 @@ class Poppler {
 					} else if (stdErr !== "") {
 						reject(new Error(stdErr.trim()));
 					} else {
+						/* istanbul ignore next */
 						reject(new Error(errorMessages[code]));
 					}
 				});
@@ -751,7 +732,7 @@ class Poppler {
 					args.push("-");
 				}
 
-				const child = execFile(
+				const child = spawn(
 					path.joinSafe(this.popplerPath, "pdftocairo"),
 					args
 				);
@@ -787,6 +768,7 @@ class Poppler {
 					} else if (stdErr !== "") {
 						reject(new Error(stdErr.trim()));
 					} else {
+						/* istanbul ignore next */
 						reject(new Error(errorMessages[code]));
 					}
 				});
@@ -894,7 +876,7 @@ class Poppler {
 					args.push(outputFile);
 				}
 
-				const child = execFile(
+				const child = spawn(
 					path.joinSafe(this.popplerPath, "pdftohtml"),
 					args
 				);
@@ -923,6 +905,7 @@ class Poppler {
 					} else if (stdErr !== "") {
 						reject(new Error(stdErr.trim()));
 					} else {
+						/* istanbul ignore next */
 						reject(new Error(errorMessages[code]));
 					}
 				});
@@ -1101,7 +1084,7 @@ class Poppler {
 
 				args.push(outputPath);
 
-				const child = execFile(
+				const child = spawn(
 					path.joinSafe(this.popplerPath, "pdftoppm"),
 					args
 				);
@@ -1123,6 +1106,7 @@ class Poppler {
 					} else if (code === 0) {
 						resolve(errorMessages[code]);
 					} else {
+						/* istanbul ignore next */
 						reject(new Error(errorMessages[code]));
 					}
 				});
@@ -1339,7 +1323,7 @@ class Poppler {
 					args.push("-");
 				}
 
-				const child = execFile(
+				const child = spawn(
 					path.joinSafe(this.popplerPath, "pdftops"),
 					args
 				);
@@ -1368,6 +1352,7 @@ class Poppler {
 					} else if (stdErr !== "") {
 						reject(new Error(stdErr.trim()));
 					} else {
+						/* istanbul ignore next */
 						reject(new Error(errorMessages[code]));
 					}
 				});
@@ -1489,7 +1474,7 @@ class Poppler {
 					args.push("-");
 				}
 
-				const child = execFile(
+				const child = spawn(
 					path.joinSafe(this.popplerPath, "pdftotext"),
 					args
 				);
@@ -1518,6 +1503,7 @@ class Poppler {
 					} else if (stdErr !== "") {
 						reject(new Error(stdErr.trim()));
 					} else {
+						/* istanbul ignore next */
 						reject(new Error(errorMessages[code]));
 					}
 				});

package/src/lib/win32/{poppler-21.11.0 → poppler-22.01.0}/Library/include/poppler/Annot.h

@@ -40,6 +40,7 @@
 // Copyright (C) 2021 Klarälvdalens Datakonsult AB, a KDAB Group company, <info@kdab.com>.
 // Copyright (C) 2021 Zachary Travis <ztravis@everlaw.com>
 // Copyright (C) 2021 Mahmoud Ahmed Khalil <mahmoudkhalil11@gmail.com>
+// Copyright (C) 2021 Georgiy Sgibnev <georgiy@sgibnev.com>. Work sponsored by lab50.net.
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git
@@ -597,7 +598,8 @@ private:
                              XRef *xref, Dict *resourcesDict);
     bool drawSignatureFieldText(const FormFieldSignature *field, const Form *form, const GfxResources *resources, const GooString *da, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect,
                                 XRef *xref, Dict *resourcesDict);
-    void drawSignatureFieldText(const GooString &text, const DefaultAppearance &da, const AnnotBorder *border, const PDFRectangle *rect, XRef *xref, Dict *resourcesDict, double leftMargin, bool centerVertically, bool centerHorizontally);
+    void drawSignatureFieldText(const GooString &text, const DefaultAppearance &da, const AnnotBorder *border, const PDFRectangle *rect, XRef *xref, Dict *resourcesDict, double leftMargin, bool centerVertically, bool centerHorizontally,
+                                const Ref imageResourceRef = Ref::INVALID());
     bool drawText(const GooString *text, const GooString *da, const GfxResources *resources, const AnnotBorder *border, const AnnotAppearanceCharacs *appearCharacs, const PDFRectangle *rect, bool multiline, int comb, int quadding,
                   bool txField, bool forceZapfDingbats, XRef *xref, bool password, Dict *resourcesDict, const char *defaultFallback = "Helvetica");
     void drawArrowPath(double x, double y, const Matrix &m, int orientation = 1);

package/src/lib/win32/{poppler-21.11.0 → poppler-22.01.0}/Library/include/poppler/Array.h

@@ -60,6 +60,8 @@ public:
     // Copy array with new xref
     Array *copy(XRef *xrefA) const;
 
+    Array *deepCopy() const;
+
     // Add an element
     // elem becomes a dead object after this call
     void add(Object &&elem);

package/src/lib/win32/{poppler-21.11.0 → poppler-22.01.0}/Library/include/poppler/CairoOutputDev.h

@@ -26,6 +26,7 @@
 // Copyright (C) 2018, 2019, 2021 Albert Astals Cid <aacid@kde.org>
 // Copyright (C) 2018 Klarälvdalens Datakonsult AB, a KDAB Group company, <info@kdab.com>. Work sponsored by the LiMux project of the city of Munich
 // Copyright (C) 2020 Michal <sudolskym@gmail.com>
+// Copyright (C) 2021 Christian Persch <chpe@src.gnome.org>
 //
 // To see a description of the changes please see the Changelog file that
 // came with your tarball or type make ChangeLog if you are building from git