build: fix type errors with newer versions of typescript

package.json

@@ -17,21 +17,21 @@
 	"type": "module",
 	"devDependencies": {
 		"@ledge/configs": "23.3.23322",
-		"@rollup/plugin-typescript": "8.3.2",
+		"@rollup/plugin-typescript": "8.5.0",
 		"@types/mailparser": "3.4.0",
 		"@types/node": "12.12.6",
 		"@types/smtp-server": "3.5.7",
-		"@typescript-eslint/eslint-plugin": "5.21.0",
-		"@typescript-eslint/parser": "5.21.0",
-		"ava": "4.2.0",
-		"eslint": "8.14.0",
+		"@typescript-eslint/eslint-plugin": "5.40.0",
+		"@typescript-eslint/parser": "5.40.0",
+		"ava": "4.3.3",
+		"eslint": "8.25.0",
 		"eslint-config-prettier": "8.5.0",
-		"eslint-plugin-prettier": "4.0.0",
+		"eslint-plugin-prettier": "4.2.1",
 		"mailparser": "3.5.0",
-		"prettier": "2.6.2",
-		"rollup": "2.70.2",
+		"prettier": "2.7.1",
+		"rollup": "2.79.0",
 		"smtp-server": "3.11.0",
-		"ts-node": "10.7.0",
+		"ts-node": "10.9.1",
 		"tslib": "2.4.0",
 		"typescript": "4.3.5"
 	},
@@ -44,7 +44,7 @@
 		}
 	},
 	"resolutions": {
-		"nodemailer": "6.7.4"
+		"nodemailer": "6.8.0"
 	},
 	"engines": {
 		"node": ">=12"

smtp/address.ts

@@ -5,7 +5,7 @@ interface AddressToken {
 
 export interface AddressObject {
 	address?: string;
-	name?: string;
+	name?: string | undefined;
 	group?: AddressObject[];
 }
 
@@ -40,11 +40,12 @@ function tokenizeAddress(address: string | string[] = '') {
 	let operator: string | undefined = undefined;
 
 	for (const character of address.toString()) {
-		if ((operator?.length ?? 0) > 0 && character === operator) {
+		const operatorHasLength = operator != null && operator.length > 0;
+		if (operatorHasLength === true && character === operator) {
 			tokens.push({ type: 'operator', value: character });
 			token = undefined;
 			operator = undefined;
-		} else if ((operator?.length ?? 0) === 0 && OPERATORS.has(character)) {
+		} else if (operatorHasLength === false && OPERATORS.has(character)) {
 			tokens.push({ type: 'operator', value: character });
 			token = undefined;
 			operator = OPERATORS.get(character);
@@ -137,7 +138,11 @@ function convertAddressTokens(tokens: AddressToken[]) {
 		// If no address was found, try to detect one from regular text
 		if (addresses.length === 0 && texts.length > 0) {
 			for (let i = texts.length - 1; i >= 0; i--) {
-				if (texts[i].match(/^[^@\s]+@[^@\s]+$/)) {
+				const text = texts[i];
+				if (text == null) {
+					continue;
+				}
+				if (/^[^@\s]+@[^@\s]+$/.test(text)) {
 					addresses = texts.splice(i, 1);
 					break;
 				}
@@ -146,16 +151,21 @@ function convertAddressTokens(tokens: AddressToken[]) {
 			// still no address
 			if (addresses.length === 0) {
 				for (let i = texts.length - 1; i >= 0; i--) {
-					texts[i] = texts[i]
-						.replace(/\s*\b[^@\s]+@[^@\s]+\b\s*/, (address: string) => {
-							if (addresses.length === 0) {
-								addresses = [address.trim()];
-								return ' ';
-							} else {
-								return address;
-							}
-						})
-						.trim();
+					const text = texts[i];
+					if (text != null && text.length > 0) {
+						texts[i] = text
+							.replace(/\s*\b[^@\s]+@[^@\s]+\b\s*/, (address: string) => {
+								if (addresses.length === 0) {
+									addresses = [address.trim()];
+									return ' ';
+								} else {
+									return address;
+								}
+							})
+							.trim();
+					} else {
+						texts[i] = '';
+					}
 
 					if (addresses.length > 0) {
 						break;

smtp/client.ts

@@ -1,4 +1,4 @@
-import { addressparser } from './address.js';
+import { AddressObject, addressparser } from './address.js';
 import type { MessageAttachment, MessageHeaders } from './message.js';
 import { Message } from './message.js';
 import type { SMTPConnectionOptions } from './connection.js';
@@ -113,10 +113,10 @@ export class SMTPClient {
 			/* ø */
 		}
 	) {
-		const [{ address: from }] = addressparser(message.header.from);
+		const [{ address: from = '' } = {}] = addressparser(message.header.from);
 		const stack = {
 			message,
-			to: [] as ReturnType<typeof addressparser>,
+			to: new Array<AddressObject>(),
 			from,
 			callback: callback.bind(this),
 		} as MessageStack;
@@ -146,10 +146,10 @@ export class SMTPClient {
 		}
 
 		if (typeof returnPath === 'string' && returnPath.length > 0) {
-			const parsedReturnPath = addressparser(returnPath);
-			if (parsedReturnPath.length > 0) {
-				const [{ address: returnPathAddress }] = parsedReturnPath;
-				stack.returnPath = returnPathAddress as string;
+			const parsedAddresses = addressparser(returnPath);
+			if (parsedAddresses.length > 0) {
+				const [{ address = '' } = {}] = parsedAddresses;
+				stack.returnPath = address;
 			}
 		}
 
@@ -165,15 +165,17 @@ export class SMTPClient {
 			clearTimeout(this.timer);
 		}
 
-		if (this.queue.length) {
+		const queueItem = this.queue[0];
+		if (queueItem) {
 			if (this.smtp.state() == SMTPState.NOTCONNECTED) {
-				this._connect(this.queue[0]);
+				this._connect(queueItem);
 			} else if (
 				this.smtp.state() == SMTPState.CONNECTED &&
 				!this.sending &&
 				this.ready
 			) {
-				this._sendmail(this.queue.shift() as MessageStack);
+				this.queue.shift();
+				this._sendmail(queueItem);
 			}
 		}
 		// wait around 1 seconds in case something does come in,
@@ -312,10 +314,10 @@ export class SMTPClient {
 			throw new TypeError('stack.to must be array');
 		}
 
-		const to = stack.to.shift()?.address;
+		const to = stack.to.shift();
 		this.smtp.rcpt(
 			this._sendsmtp(stack, stack.to.length ? this._sendrcpt : this._senddata),
-			`<${to}>`
+			`<${to == null ? '' : to.address || ''}>`
 		);
 	}
 

smtp/connection.ts

@@ -74,7 +74,7 @@ export type SMTPSocketOptions = Omit<
 >;
 
 export interface SMTPConnectionOptions {
-	timeout: number | null;
+	timeout: number | null | undefined;
 	user: string;
 	password: string;
 	domain: string;
@@ -174,7 +174,7 @@ export class SMTPConnection extends EventEmitter {
 		this.port = port || (ssl ? SMTP_SSL_PORT : tls ? SMTP_TLS_PORT : SMTP_PORT);
 		this.loggedin = user && password ? false : true;
 
-		if (!user && (password?.length ?? 0) > 0) {
+		if (user == null && password != null && password.length > 0) {
 			throw new Error('`password` cannot be set without `user`');
 		}
 
@@ -520,7 +520,8 @@ export class SMTPConnection extends EventEmitter {
 				// It's actually stricter, in that only spaces are allowed between
 				// parameters, but were not going to check for that here.  Note
 				// that the space isn't present if there are no parameters.
-				this.features[parse[1].toLowerCase()] = parse[2] || true;
+				const [, one = '', two = true] = parse;
+				this.features[one.toLowerCase()] = two;
 			}
 		});
 	}
@@ -554,7 +555,7 @@ export class SMTPConnection extends EventEmitter {
 	 * @returns {boolean} whether the extension exists
 	 */
 	public has_extn(opt: string) {
-		return (this.features ?? {})[opt.toLowerCase()] === undefined;
+		return this.features != null && this.features[opt.toLowerCase()] != null;
 	}
 
 	/**
@@ -631,7 +632,11 @@ export class SMTPConnection extends EventEmitter {
 	 */
 	public message(data: string) {
 		this.log(data);
-		this.sock?.write(data) ?? this.log('no socket to write to');
+		if (this.sock != null) {
+			this.sock.write(data);
+		} else {
+			this.log('no socket to write to');
+		}
 	}
 
 	/**
@@ -710,10 +715,10 @@ export class SMTPConnection extends EventEmitter {
 		const login = {
 			user: user ? () => user : this.user,
 			password: password ? () => password : this.password,
-			method: options?.method?.toUpperCase() ?? '',
+			method: options.method != null ? options.method.toUpperCase() : '',
 		};
 
-		const domain = options?.domain || this.domain;
+		const domain = options.domain || this.domain;
 
 		const initiate = (err: Error | null | undefined, data: unknown) => {
 			if (err) {
@@ -755,16 +760,18 @@ export class SMTPConnection extends EventEmitter {
 			// List of authentication methods we support: from preferred to
 			// less preferred methods.
 			if (!method) {
-				const preferred = this.authentication;
 				let auth = '';
 
-				if (typeof this.features?.['auth'] === 'string') {
+				if (
+					this.features != null &&
+					typeof this.features['auth'] === 'string'
+				) {
 					auth = this.features['auth'];
 				}
 
-				for (let i = 0; i < preferred.length; i++) {
-					if (auth.includes(preferred[i])) {
-						method = preferred[i];
+				for (const authMethod of this.authentication) {
+					if (auth.includes(authMethod)) {
+						method = authMethod;
 						break;
 					}
 				}

smtp/date.ts

@@ -8,19 +8,13 @@ export function getRFC2822Date(date = new Date(), useUtc = false) {
 		return getRFC2822DateUTC(date);
 	}
 
-	const dates = date
+	const [zero, one, two, ...rest] = date
 		.toString()
 		.replace('GMT', '')
 		.replace(/\s\(.*\)$/, '')
 		.split(' ');
 
-	dates[0] = dates[0] + ',';
-
-	const day = dates[1];
-	dates[1] = dates[2];
-	dates[2] = day;
-
-	return dates.join(' ');
+	return [zero + ',', two, one, ...rest].join(' ');
 }
 
 /**

smtp/error.ts

@@ -42,7 +42,9 @@ export class SMTPError extends Error {
 		error?: Error | null,
 		smtp?: unknown
 	) {
-		const msg = error?.message ? `${message} (${error.message})` : message;
+		const shouldUseError =
+			error != null && error.message != null && error.message.length > 0;
+		const msg = shouldUseError ? `${message} (${error.message})` : message;
 		const err = new SMTPError(msg);
 
 		err.code = code;

smtp/message.ts

@@ -150,8 +150,8 @@ export class Message {
 			) {
 				const attachment = headers[header];
 				if (Array.isArray(attachment)) {
-					for (let i = 0; i < attachment.length; i++) {
-						this.attach(attachment[i]);
+					for (const attachmentItem of attachment) {
+						this.attach(attachmentItem);
 					}
 				} else if (attachment != null) {
 					this.attach(attachment);
@@ -163,7 +163,7 @@ export class Message {
 					headers[header] as string | string[]
 				);
 			} else {
-				// allow any headers the user wants to set??
+				// allow any headers the user wants to set
 				this.header[header.toLowerCase()] = headers[header];
 			}
 		}
@@ -419,9 +419,9 @@ class MessageStream extends Stream {
 		) => {
 			const chunk = MIME64CHUNK * 16;
 			const buffer = Buffer.alloc(chunk);
+			const { headers = {} } = attachment;
 
-			const inputEncoding =
-				attachment?.headers?.['content-transfer-encoding'] || 'base64';
+			const inputEncoding = headers['content-transfer-encoding'] || 'base64';
 			const encoding =
 				inputEncoding === '7bit'
 					? 'ascii'
@@ -479,7 +479,7 @@ class MessageStream extends Stream {
 			callback: () => void
 		) => {
 			const { stream } = attachment;
-			if (stream?.readable) {
+			if (stream != null && stream.readable) {
 				let previous = Buffer.alloc(0);
 
 				stream.resume();
@@ -546,14 +546,17 @@ class MessageStream extends Stream {
 		) => {
 			if (index < list.length) {
 				output(`--${boundary}${CRLF}`);
-				if (list[index].related) {
-					outputRelated(list[index], () =>
-						outputMessage(boundary, list, index + 1, callback)
-					);
-				} else {
-					outputAttachment(list[index], () =>
-						outputMessage(boundary, list, index + 1, callback)
-					);
+				const item = list[index];
+				if (item != null) {
+					if (item.related) {
+						outputRelated(item, () =>
+							outputMessage(boundary, list, index + 1, callback)
+						);
+					} else {
+						outputAttachment(item, () =>
+							outputMessage(boundary, list, index + 1, callback)
+						);
+					}
 				}
 			} else {
 				output(`${CRLF}--${boundary}--${CRLF}${CRLF}`);
@@ -588,10 +591,9 @@ class MessageStream extends Stream {
 			attachment: MessageAttachment,
 			callback: () => void
 		) => {
+			const { data = '' } = attachment;
 			outputBase64(
-				attachment.encoded
-					? attachment.data ?? ''
-					: Buffer.from(attachment.data ?? '').toString('base64'),
+				attachment.encoded ? data : Buffer.from(data).toString('base64'),
 				callback
 			);
 		};
@@ -630,7 +632,8 @@ class MessageStream extends Stream {
 				`Content-Type: multipart/related; boundary="${boundary}"${CRLF}${CRLF}--${boundary}${CRLF}`
 			);
 			outputAttachment(message, () => {
-				outputMessage(boundary, message.related ?? [], 0, () => {
+				const { related = [] } = message;
+				outputMessage(boundary, related, 0, () => {
 					output(`${CRLF}--${boundary}--${CRLF}${CRLF}`);
 					callback();
 				});
@@ -674,7 +677,9 @@ class MessageStream extends Stream {
 			} else {
 				this.emit(
 					'data',
-					this.buffer?.toString('utf-8', 0, this.bufferIndex) ?? ''
+					this.buffer != null
+						? this.buffer.toString('utf-8', 0, this.bufferIndex)
+						: ''
 				);
 				this.emit('end');
 			}