Merge pull request #361 from Fdawgs/build/deps

package.json

@@ -74,30 +74,30 @@
 		"testTimeout": 10000
 	},
 	"devDependencies": {
-		"@commitlint/cli": "^18.5.0",
-		"@commitlint/config-conventional": "^18.5.0",
+		"@commitlint/cli": "^18.6.1",
+		"@commitlint/config-conventional": "^18.6.2",
 		"@eslint-community/eslint-plugin-eslint-comments": "^4.1.0",
-		"@types/jest": "^29.5.11",
+		"@types/jest": "^29.5.12",
 		"eslint": "^8.56.0",
 		"eslint-config-airbnb-base": "^15.0.0",
 		"eslint-config-prettier": "^9.1.0",
 		"eslint-plugin-import": "^2.29.1",
-		"eslint-plugin-jest": "^27.6.3",
-		"eslint-plugin-jsdoc": "^48.0.2",
+		"eslint-plugin-jest": "^27.9.0",
+		"eslint-plugin-jsdoc": "^48.1.0",
 		"eslint-plugin-promise": "^6.1.1",
 		"eslint-plugin-regexp": "^2.2.0",
-		"eslint-plugin-security": "^2.1.0",
-		"husky": "^9.0.6",
+		"eslint-plugin-security": "^2.1.1",
+		"husky": "^9.0.11",
 		"is-html": "^2.0.0",
 		"jest": "^29.7.0",
-		"jsdoc-to-markdown": "^8.0.0",
+		"jsdoc-to-markdown": "^8.0.1",
 		"license-checker": "^25.0.1",
-		"prettier": "^3.2.4",
+		"prettier": "^3.2.5",
 		"spdx-copyleft": "^1.0.0",
 		"typescript": "^5.3.3"
 	},
 	"dependencies": {
-		"semver": "^7.5.4",
+		"semver": "^7.6.0",
 		"upath": "^2.0.1"
 	}
 }

src/index.js

@@ -8,12 +8,12 @@ const { joinSafe, normalizeTrim } = require("upath");
 const errorMessages = {
 	3221225477: "Segmentation fault",
 };
+const rtfMagicNumber = "{\\rtf1";
 
 // Cache immutable regex as they are expensive to create and garbage collect
 const unrtfPathRegex = /(.+)unrtf/u;
 // UnRTF version output is inconsistent between versions but always starts with the semantic version number
 const unrtfVersionRegex = /^(\d{1,2}\.\d{1,2}\.\d{1,2})/u;
-const rtfMagicNumberRegex = /^\{\\rtf/u;
 
 /**
  * @author Frazer Smith
@@ -34,7 +34,7 @@ function parseOptions(acceptedOptions, options, version) {
 	Object.keys(options).forEach((key) => {
 		if (Object.hasOwn(acceptedOptions, key)) {
 			// eslint-disable-next-line valid-typeof -- `type` is a string
-			if (typeof options[key] === acceptedOptions[key].type) {
+			if (acceptedOptions[key].type === typeof options[key]) {
 				// Skip boolean options if false
 				if (acceptedOptions[key].type === "boolean" && !options[key]) {
 					return;
@@ -213,7 +213,7 @@ class UnRTF {
 			throw new Error("File missing");
 		}
 		// Check for RTF specific magic number
-		if (!rtfMagicNumberRegex.test(buff.toString())) {
+		if (!buff.toString().startsWith(rtfMagicNumber)) {
 			throw new Error(
 				"File is not the correct media type, expected 'application/rtf'"
 			);
@@ -244,9 +244,7 @@ class UnRTF {
 				/* istanbul ignore else */
 				if (stdOut !== "") {
 					resolve(stdOut.trim());
-				} else if (stdErr !== "") {
-					reject(new Error(stdErr.trim()));
-				} else {
+				} else if (stdErr === "") {
 					reject(
 						new Error(
 							errorMessages[code] ||
@@ -255,6 +253,8 @@ class UnRTF {
 								)} exited with code ${code}`
 						)
 					);
+				} else {
+					reject(new Error(stdErr.trim()));
 				}
 			});
 		});

tsconfig.json

@@ -8,7 +8,7 @@
 		"moduleResolution": "NodeNext",
 		"outDir": "types",
 		"resolveJsonModule": true,
-		"target": "ES2022",
+		"target": "ES2022"
 	},
-	"include": ["src/index.js"],
+	"include": ["src/index.js"]
 }