fix: add @typescript-eslint/consistent-type-imports rule and normalised all imports

Author: SmashingQuasar

.eslintrc.js

@@ -47,5 +47,13 @@ module.exports = {
 		'@typescript-eslint/naming-convention': 'off',
 		'@typescript-eslint/dot-notation': 'off',
 		'@typescript-eslint/no-use-before-define': 'off',
+		'@typescript-eslint/consistent-type-imports': [
+			'error',
+			{
+				'prefer': 'type-imports',
+				'fixStyle': 'inline-type-imports',
+				'disallowTypeAnnotations': true
+			}
+		]
 	}
 }

src/bin/pub.ts

@@ -6,10 +6,10 @@ import fs from 'fs'
 import concat from 'concat-stream'
 import help from 'help-me'
 
-import minimist, { ParsedArgs } from 'minimist'
+import minimist, { type ParsedArgs } from 'minimist'
 import split2 from 'split2'
 import { connect } from '../mqtt'
-import { IClientOptions, IClientPublishOptions } from 'src/lib/client'
+import { type IClientOptions, type IClientPublishOptions } from 'src/lib/client'
 import { pipeline } from 'stream'
 
 const helpMe = help({

src/bin/sub.ts

@@ -5,7 +5,7 @@ import fs from 'fs'
 import minimist from 'minimist'
 import help from 'help-me'
 import { connect } from '../mqtt'
-import { IClientOptions } from 'src/lib/client'
+import { type IClientOptions } from 'src/lib/client'
 
 const helpMe = help({
 	dir: path.join(__dirname, '../../', 'help'),

src/lib/BufferedDuplex.ts

@@ -1,6 +1,6 @@
-import { Duplex, Transform } from 'readable-stream'
+import { Duplex, type Transform } from 'readable-stream'
 import { Buffer } from 'buffer'
-import { IClientOptions } from './client'
+import { type IClientOptions } from './client'
 
 /**
  * Utils writev function for browser, ensure to write Buffers to socket (convert strings).

src/lib/client.ts

@@ -3,45 +3,45 @@
  */
 import TopicAliasRecv from './topic-alias-recv'
 import mqttPacket, {
-	IAuthPacket,
+	type IAuthPacket,
 	IConnackPacket,
 	IDisconnectPacket,
 	IPublishPacket,
-	ISubscribePacket,
-	ISubscription,
-	IUnsubscribePacket,
+	type ISubscribePacket,
+	type ISubscription,
+	type IUnsubscribePacket,
 	Packet,
-	QoS,
-	ISubackPacket,
-	IConnectPacket,
+	type QoS,
+	type ISubackPacket,
+	type IConnectPacket,
 } from 'mqtt-packet'
 import DefaultMessageIdProvider, {
-	IMessageIdProvider,
+	type IMessageIdProvider,
 } from './default-message-id-provider'
-import { DuplexOptions, Writable } from 'readable-stream'
+import { type DuplexOptions, Writable } from 'readable-stream'
 import clone from 'rfdc/default'
 import * as validations from './validations'
 import _debug from 'debug'
-import Store, { IStore } from './store'
+import Store, { type IStore } from './store'
 import handlePacket from './handlers'
-import { ClientOptions } from 'ws'
-import { ClientRequestArgs } from 'http'
+import type { ClientOptions } from 'ws'
+import { type ClientRequestArgs } from 'http'
 import {
-	DoneCallback,
-	ErrorWithReasonCode,
-	GenericCallback,
-	IStream,
+	type DoneCallback,
+	type ErrorWithReasonCode,
+	type GenericCallback,
+	type IStream,
 	MQTTJS_VERSION,
-	StreamBuilder,
-	TimerVariant,
-	VoidCallback,
+	type StreamBuilder,
+	type TimerVariant,
+	type VoidCallback,
 	nextTick,
 } from './shared'
-import TopicAliasSend from './topic-alias-send'
+import type TopicAliasSend from './topic-alias-send'
 import { TypedEventEmitter } from './TypedEmitter'
 import KeepaliveManager from './KeepaliveManager'
 import isBrowser, { isWebWorker } from './is-browser'
-import { Timer } from './get-timer'
+import { type Timer } from './get-timer'
 
 const setImmediate =
 	globalThis.setImmediate ||

src/lib/connect/ali.ts

@@ -1,7 +1,8 @@
 import { Buffer } from 'buffer'
 import { Transform } from 'readable-stream'
-import { StreamBuilder } from '../shared'
-import MqttClient, { IClientOptions } from '../client'
+import { type StreamBuilder } from '../shared'
+import { type IClientOptions } from '../client'
+import type MqttClient from '../client'
 import { BufferedDuplex } from '../BufferedDuplex'
 
 let my: any

src/lib/connect/index.ts

@@ -2,12 +2,12 @@
 import _debug from 'debug'
 import url from 'url'
 import MqttClient, {
-	IClientOptions,
-	MqttClientEventCallbacks,
-	MqttProtocol,
+	type IClientOptions,
+	type MqttClientEventCallbacks,
+	type MqttProtocol,
 } from '../client'
 import isBrowser from '../is-browser'
-import { StreamBuilder } from '../shared'
+import { type StreamBuilder } from '../shared'
 
 // Handling the process.nextTick is not a function error in react-native applications.
 if (typeof process?.nextTick !== 'function') {

src/lib/connect/socks.ts

@@ -1,11 +1,11 @@
 import _debug from 'debug'
 import { Duplex } from 'stream'
-import { SocksClient, SocksProxy } from 'socks'
+import { SocksClient, type SocksProxy } from 'socks'
 import * as dns from 'dns'
-import { SocksProxyType } from 'socks/typings/common/constants'
-import { IStream } from '../shared'
+import { type SocksProxyType } from 'socks/typings/common/constants'
+import { type IStream } from '../shared'
 import { promisify } from 'util'
-import { Socket } from 'net'
+import { type Socket } from 'net'
 import assert from 'assert'
 
 const debug = _debug('mqttjs:socks')

src/lib/connect/tcp.ts

@@ -1,4 +1,4 @@
-import { StreamBuilder } from '../shared'
+import { type StreamBuilder } from '../shared'
 
 import net from 'net'
 import _debug from 'debug'

src/lib/connect/tls.ts

@@ -1,8 +1,8 @@
-import tls, { TLSSocket } from 'tls'
+import tls, { type TLSSocket } from 'tls'
 import net from 'net'
 import _debug from 'debug'
-import { StreamBuilder } from '../shared'
-import { IClientOptions } from '../client'
+import { type StreamBuilder } from '../shared'
+import { type IClientOptions } from '../client'
 import openSocks from './socks'
 
 const debug = _debug('mqttjs:tls')