From 93f23cdc11700cb9377a221aab7d8da3b696b1f1 Mon Sep 17 00:00:00 2001 From: Zack Schuster Date: Fri, 1 May 2020 12:07:48 -0700 Subject: [PATCH] chore: move type imports from inline statements --- smtp/client.ts | 8 +++++--- smtp/message.ts | 6 +++--- smtp/response.ts | 9 +++++++-- smtp/smtp.ts | 5 ++--- test/authplain.ts | 7 ++----- test/authssl.ts | 7 ++----- test/message.ts | 7 ++----- 7 files changed, 23 insertions(+), 26 deletions(-) diff --git a/smtp/client.ts b/smtp/client.ts index 0491fb4..a141cf2 100644 --- a/smtp/client.ts +++ b/smtp/client.ts @@ -1,12 +1,14 @@ // @ts-ignore import addressparser from 'addressparser'; import { Message } from './message'; +import type { MessageAttachment, MessageHeaders } from './message'; // eslint-disable-line no-unused-vars import { SMTP, SMTPState } from './smtp'; +import type { SMTPOptions } from './smtp'; // eslint-disable-line no-unused-vars export interface MessageStack { callback: (error: Error | null, message: Message) => void; message: Message; - attachment: import('./message').MessageAttachment; + attachment: MessageAttachment; text: string; returnPath: string; from: string; @@ -25,7 +27,7 @@ export class Client { /** * @param {*} server smtp options */ - constructor(server: Partial) { + constructor(server: Partial) { this.smtp = new SMTP(server); //this.smtp.debug(1); } @@ -152,7 +154,7 @@ export class Client { * @param {MessageStack} msg message stack * @returns {boolean} can make message */ - _canMakeMessage(msg: import('./message').MessageHeaders) { + _canMakeMessage(msg: MessageHeaders) { return ( msg.from && (msg.to || msg.cc || msg.bcc) && diff --git a/smtp/message.ts b/smtp/message.ts index 00a0ed9..d3d55ab 100644 --- a/smtp/message.ts +++ b/smtp/message.ts @@ -1,6 +1,8 @@ import fs from 'fs'; import { hostname } from 'os'; import { Stream } from 'stream'; +import type { Duplex } from 'stream'; // eslint-disable-line no-unused-vars +import type { Indexed } from '@ledge/types'; // eslint-disable-line no-unused-vars // @ts-ignore import addressparser from 'addressparser'; // @ts-ignore @@ -8,8 +10,6 @@ import { mimeWordEncode } from 'emailjs-mime-codec'; import { getRFC2822Date } from './date'; -type Indexed = import('@ledge/types').Indexed; - const CRLF = '\r\n' as const; /** @@ -48,7 +48,7 @@ export interface MessageAttachment extends AlternateMessageAttachment { charset: string; method: string; path: string; - stream: import('stream').Duplex; + stream: Duplex; } export interface MessageHeaders extends Indexed { diff --git a/smtp/response.ts b/smtp/response.ts index 7086812..5d8b097 100644 --- a/smtp/response.ts +++ b/smtp/response.ts @@ -1,10 +1,15 @@ import { makeSMTPError, SMTPErrorStates } from './error'; +import type { Socket } from 'net'; // eslint-disable-line no-unused-vars +import type { TLSSocket } from 'tls'; // eslint-disable-line no-unused-vars -type Socket = import('net').Socket | import('tls').TLSSocket; export class SMTPResponse { public stop: (err?: Error) => void; - constructor(stream: Socket, timeout: number, onerror: (err: Error) => void) { + constructor( + stream: Socket | TLSSocket, + timeout: number, + onerror: (err: Error) => void + ) { let buffer = ''; const notify = () => { diff --git a/smtp/smtp.ts b/smtp/smtp.ts index 59aa265..67397f7 100644 --- a/smtp/smtp.ts +++ b/smtp/smtp.ts @@ -3,6 +3,7 @@ import { createHmac } from 'crypto'; import { hostname } from 'os'; import { connect, createSecureContext, TLSSocket } from 'tls'; import { EventEmitter } from 'events'; +import type { Indexed } from '@ledge/types'; // eslint-disable-line no-unused-vars import { SMTPResponse } from './response'; import { makeSMTPError, SMTPErrorStates } from './error'; @@ -94,9 +95,7 @@ export class SMTP extends EventEmitter { private _secure = false; protected sock: Socket | TLSSocket | null = null; - protected features: - | import('@ledge/types').Indexed - | null = null; + protected features: Indexed | null = null; protected monitor: SMTPResponse | null = null; protected authentication: (keyof typeof AUTH_METHODS)[]; protected domain = hostname(); diff --git a/test/authplain.ts b/test/authplain.ts index 77e76c5..019bd0d 100644 --- a/test/authplain.ts +++ b/test/authplain.ts @@ -1,3 +1,4 @@ +import type { Readable } from 'stream'; // eslint-disable-line no-unused-vars import test from 'ava'; import mailparser from 'mailparser'; import smtp from 'smtp-server'; @@ -22,11 +23,7 @@ const send = ( ) => void, done: () => void ) => { - server.onData = ( - stream: import('stream').Readable, - _session, - callback: () => void - ) => { + server.onData = (stream: Readable, _session, callback: () => void) => { mailparser.simpleParser(stream).then(verify).then(done).catch(done); stream.on('end', callback); }; diff --git a/test/authssl.ts b/test/authssl.ts index 1bc5f78..2fd9cf2 100644 --- a/test/authssl.ts +++ b/test/authssl.ts @@ -1,3 +1,4 @@ +import type { Readable } from 'stream'; // eslint-disable-line no-unused-vars import test from 'ava'; import mailparser from 'mailparser'; import smtp from 'smtp-server'; @@ -22,11 +23,7 @@ const send = ( ) => void, done: () => void ) => { - server.onData = ( - stream: import('stream').Readable, - _session, - callback: () => void - ) => { + server.onData = (stream: Readable, _session, callback: () => void) => { mailparser.simpleParser(stream).then(verify).then(done).catch(done); stream.on('end', callback); }; diff --git a/test/message.ts b/test/message.ts index 1bfa615..d88fc49 100644 --- a/test/message.ts +++ b/test/message.ts @@ -1,3 +1,4 @@ +import type { Readable } from 'stream'; // eslint-disable-line no-unused-vars import { readFileSync, createReadStream } from 'fs'; import { join } from 'path'; @@ -24,11 +25,7 @@ const send = ( ) => void, done: () => void ) => { - server.onData = ( - stream: import('stream').Readable, - _session, - callback: () => void - ) => { + server.onData = (stream: Readable, _session, callback: () => void) => { mailparser.simpleParser(stream).then(verify).then(done).catch(done); stream.on('end', callback); };