refactor: remove optional chaining for first level properties (#1338)

Fdawgs · Mar 20, 2023 · 1b14dc7 · 1b14dc7
1 parent 435312c
commit 1b14dc7
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/config/config.test.js b/src/config/config.test.js
@@ -411,7 +411,7 @@ describe("Configuration", () => {
 			const CORS_ALLOWED_HEADERS =
 				"Accept, Authorization, Content-Type, Origin, X-Requested-With";
 			const CORS_ALLOW_CREDENTIALS =
-				envVariables?.CORS_ALLOW_CREDENTIALS || "";
+				envVariables.CORS_ALLOW_CREDENTIALS || "";
 			const CORS_EXPOSED_HEADERS = "Location";
 			const CORS_MAX_AGE = 10;
 			const LOG_LEVEL = "trace";
@@ -437,7 +437,7 @@ describe("Configuration", () => {
 			expect(config.cors).toEqual({
 				origin: expected.origin,
 				allowedHeaders: CORS_ALLOWED_HEADERS,
-				credentials: expected?.credentials || false,
+				credentials: expected.credentials || false,
 				exposedHeaders: CORS_EXPOSED_HEADERS,
 				hideOptionsRoute: true,
 				maxAge: CORS_MAX_AGE,
@@ -465,10 +465,10 @@ describe("Configuration", () => {
 	])("Should throw error if $testName", async ({ envVariables }) => {
 		const HOST = "0.0.0.0";
 		const PORT = 443;
-		const HTTPS_SSL_KEY_PATH = envVariables?.HTTPS_SSL_KEY_PATH || "";
-		const HTTPS_SSL_CERT_PATH = envVariables?.HTTPS_SSL_CERT_PATH || "";
-		const HTTPS_PFX_FILE_PATH = envVariables?.HTTPS_PFX_FILE_PATH || "";
-		const HTTPS_PFX_PASSPHRASE = envVariables?.HTTPS_PFX_PASSPHRASE || "";
+		const HTTPS_SSL_KEY_PATH = envVariables.HTTPS_SSL_KEY_PATH || "";
+		const HTTPS_SSL_CERT_PATH = envVariables.HTTPS_SSL_CERT_PATH || "";
+		const HTTPS_PFX_FILE_PATH = envVariables.HTTPS_PFX_FILE_PATH || "";
+		const HTTPS_PFX_PASSPHRASE = envVariables.HTTPS_PFX_PASSPHRASE || "";
 		const LOG_LEVEL = "trace";
 
 		Object.assign(process.env, {

diff --git a/src/plugins/pdf-to-html/index.js b/src/plugins/pdf-to-html/index.js
@@ -67,7 +67,7 @@ async function plugin(server, options) {
 	 * cancelled request temp data is also removed.
 	 */
 	server.addHook("onSend", async (req, _res, payload) => {
-		if (req?.conversionResults?.docLocation) {
+		if (req.conversionResults?.docLocation) {
 			// Remove files from temp directory after response sent
 			const files = await glob(
 				`${path.joinSafe(

diff --git a/src/plugins/pdf-to-txt/index.js b/src/plugins/pdf-to-txt/index.js
@@ -79,7 +79,7 @@ async function plugin(server, options) {
 	 * cancelled request temp data is also removed
 	 */
 	server.addHook("onSend", async (req, _res, payload) => {
-		if (req?.conversionResults?.docLocation) {
+		if (req.conversionResults?.docLocation) {
 			// Remove files from temp directory after response sent
 			const files = await glob(
 				`${path.joinSafe(
@@ -125,7 +125,7 @@ async function plugin(server, options) {
 		 * image-to-txt plugin adds the "tesseract" decorator to server instance,
 		 * if this is missing then OCR is not supported
 		 */
-		if (query?.ocr === true && server.tesseract) {
+		if (query.ocr === true && server.tesseract) {
 			// Prune params that pdfToCairo cannot accept
 			Object.keys(query).forEach((value) => {
 				if (!pdfToCairoAcceptedParams.includes(value)) {

diff --git a/src/plugins/rtf-to-html/index.js b/src/plugins/rtf-to-html/index.js
@@ -48,7 +48,7 @@ async function plugin(server, options) {
 	 * cancelled request temp data is also removed
 	 */
 	server.addHook("onSend", async (req, _res, payload) => {
-		if (req?.conversionResults?.docLocation) {
+		if (req.conversionResults?.docLocation) {
 			// Remove files from temp directory after response sent
 			const files = await glob(
 				`${path.joinSafe(

diff --git a/src/plugins/tidy-html/index.js b/src/plugins/tidy-html/index.js
@@ -28,7 +28,7 @@ async function plugin(server) {
 		const dom = new JSDOM(html);
 
 		// Set document language if valid IANA language tag and subtag
-		const language = options?.language || "en";
+		const language = options.language || "en";
 		if (!check(language)) {
 			throw server.httpErrors.badRequest(
 				"querystring.language not a valid IANA language tag"
@@ -45,7 +45,7 @@ async function plugin(server) {
 		 *
 		 * As such, alt attributes in <img> tags are set to an empty string rather than removed here
 		 */
-		if (options?.removeAlt === true) {
+		if (options.removeAlt === true) {
 			dom.window.document.querySelectorAll("img").forEach((element) => {
 				element.setAttribute("alt", "");
 			});