Skip to content

Commit 26327ee

Browse files
SmashingQuasarSmashingQuasar
committed
chore(1991): Added @typescript-eslint/consistent-type-imports rule and normalised all imports.
1 parent 3c1f335 commit 26327ee

33 files changed

+101
-81
lines changed

‎.eslintrc.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,5 +47,13 @@ module.exports = {
4747
'@typescript-eslint/naming-convention': 'off',
4848
'@typescript-eslint/dot-notation': 'off',
4949
'@typescript-eslint/no-use-before-define': 'off',
50+
'@typescript-eslint/consistent-type-imports': [
51+
'error',
52+
{
53+
'prefer': 'type-imports',
54+
'fixStyle': 'inline-type-imports',
55+
'disallowTypeAnnotations': true
56+
}
57+
]
5058
}
5159
}

‎src/bin/pub.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import fs from 'fs'
66
import concat from 'concat-stream'
77
import help from 'help-me'
88

9-
import minimist, { ParsedArgs } from 'minimist'
9+
import minimist, { type ParsedArgs } from 'minimist'
1010
import split2 from 'split2'
1111
import { connect } from '../mqtt'
12-
import { IClientOptions, IClientPublishOptions } from 'src/lib/client'
12+
import { type IClientOptions, type IClientPublishOptions } from 'src/lib/client'
1313
import { pipeline } from 'stream'
1414

1515
const helpMe = help({

‎src/bin/sub.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import fs from 'fs'
55
import minimist from 'minimist'
66
import help from 'help-me'
77
import { connect } from '../mqtt'
8-
import { IClientOptions } from 'src/lib/client'
8+
import { type IClientOptions } from 'src/lib/client'
99

1010
const helpMe = help({
1111
dir: path.join(__dirname, '../../', 'help'),

‎src/lib/BufferedDuplex.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { Duplex, Transform } from 'readable-stream'
1+
import { Duplex, type Transform } from 'readable-stream'
22
import { Buffer } from 'buffer'
3-
import { IClientOptions } from './client'
3+
import { type IClientOptions } from './client'
44

55
/**
66
* Utils writev function for browser, ensure to write Buffers to socket (convert strings).

‎src/lib/client.ts

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,45 +3,45 @@
33
*/
44
import TopicAliasRecv from './topic-alias-recv'
55
import mqttPacket, {
6-
IAuthPacket,
6+
type IAuthPacket,
77
IConnackPacket,
88
IDisconnectPacket,
99
IPublishPacket,
10-
ISubscribePacket,
11-
ISubscription,
12-
IUnsubscribePacket,
10+
type ISubscribePacket,
11+
type ISubscription,
12+
type IUnsubscribePacket,
1313
Packet,
14-
QoS,
15-
ISubackPacket,
16-
IConnectPacket,
14+
type QoS,
15+
type ISubackPacket,
16+
type IConnectPacket,
1717
} from 'mqtt-packet'
1818
import DefaultMessageIdProvider, {
19-
IMessageIdProvider,
19+
type IMessageIdProvider,
2020
} from './default-message-id-provider'
21-
import { DuplexOptions, Writable } from 'readable-stream'
21+
import { type DuplexOptions, Writable } from 'readable-stream'
2222
import clone from 'rfdc/default'
2323
import * as validations from './validations'
2424
import _debug from 'debug'
25-
import Store, { IStore } from './store'
25+
import Store, { type IStore } from './store'
2626
import handlePacket from './handlers'
27-
import { ClientOptions } from 'ws'
28-
import { ClientRequestArgs } from 'http'
27+
import type { ClientOptions } from 'ws'
28+
import { type ClientRequestArgs } from 'http'
2929
import {
30-
DoneCallback,
31-
ErrorWithReasonCode,
32-
GenericCallback,
33-
IStream,
30+
type DoneCallback,
31+
type ErrorWithReasonCode,
32+
type GenericCallback,
33+
type IStream,
3434
MQTTJS_VERSION,
35-
StreamBuilder,
36-
TimerVariant,
37-
VoidCallback,
35+
type StreamBuilder,
36+
type TimerVariant,
37+
type VoidCallback,
3838
nextTick,
3939
} from './shared'
40-
import TopicAliasSend from './topic-alias-send'
40+
import type TopicAliasSend from './topic-alias-send'
4141
import { TypedEventEmitter } from './TypedEmitter'
4242
import KeepaliveManager from './KeepaliveManager'
4343
import isBrowser, { isWebWorker } from './is-browser'
44-
import { Timer } from './get-timer'
44+
import { type Timer } from './get-timer'
4545

4646
const setImmediate =
4747
globalThis.setImmediate ||

‎src/lib/connect/ali.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import { Buffer } from 'buffer'
22
import { Transform } from 'readable-stream'
3-
import { StreamBuilder } from '../shared'
4-
import MqttClient, { IClientOptions } from '../client'
3+
import { type StreamBuilder } from '../shared'
4+
import { type IClientOptions } from '../client'
5+
import type MqttClient from '../client'
56
import { BufferedDuplex } from '../BufferedDuplex'
67

78
let my: any

‎src/lib/connect/index.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
import _debug from 'debug'
33
import url from 'url'
44
import MqttClient, {
5-
IClientOptions,
6-
MqttClientEventCallbacks,
7-
MqttProtocol,
5+
type IClientOptions,
6+
type MqttClientEventCallbacks,
7+
type MqttProtocol,
88
} from '../client'
99
import isBrowser from '../is-browser'
10-
import { StreamBuilder } from '../shared'
10+
import { type StreamBuilder } from '../shared'
1111

1212
// Handling the process.nextTick is not a function error in react-native applications.
1313
if (typeof process?.nextTick !== 'function') {

‎src/lib/connect/socks.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
import _debug from 'debug'
22
import { Duplex } from 'stream'
3-
import { SocksClient, SocksProxy } from 'socks'
3+
import { SocksClient, type SocksProxy } from 'socks'
44
import * as dns from 'dns'
5-
import { SocksProxyType } from 'socks/typings/common/constants'
6-
import { IStream } from '../shared'
5+
import { type SocksProxyType } from 'socks/typings/common/constants'
6+
import { type IStream } from '../shared'
77
import { promisify } from 'util'
8-
import { Socket } from 'net'
8+
import { type Socket } from 'net'
99
import assert from 'assert'
1010

1111
const debug = _debug('mqttjs:socks')

‎src/lib/connect/tcp.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { StreamBuilder } from '../shared'
1+
import { type StreamBuilder } from '../shared'
22

33
import net from 'net'
44
import _debug from 'debug'

‎src/lib/connect/tls.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import tls, { TLSSocket } from 'tls'
1+
import tls, { type TLSSocket } from 'tls'
22
import net from 'net'
33
import _debug from 'debug'
4-
import { StreamBuilder } from '../shared'
5-
import { IClientOptions } from '../client'
4+
import { type StreamBuilder } from '../shared'
5+
import { type IClientOptions } from '../client'
66
import openSocks from './socks'
77

88
const debug = _debug('mqttjs:tls')

‎src/lib/connect/ws.ts

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
import { StreamBuilder } from '../shared'
1+
import { type StreamBuilder } from '../shared'
22
import { Buffer } from 'buffer'
3-
import Ws, { ClientOptions } from 'ws'
3+
import Ws, { type ClientOptions } from 'ws'
44
import _debug from 'debug'
5-
import { DuplexOptions, Transform } from 'readable-stream'
5+
import { type DuplexOptions, Transform } from 'readable-stream'
66
import isBrowser from '../is-browser'
7-
import MqttClient, { IClientOptions } from '../client'
7+
import { type IClientOptions } from '../client'
8+
import type MqttClient from '../client'
89
import { BufferedDuplex, writev } from '../BufferedDuplex'
910

1011
const debug = _debug('mqttjs:ws')

‎src/lib/connect/wx.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
import { StreamBuilder } from '../shared'
1+
import { type StreamBuilder } from '../shared'
22

33
import { Buffer } from 'buffer'
44
import { Transform } from 'readable-stream'
5-
import MqttClient, { IClientOptions } from '../client'
5+
import { type IClientOptions } from '../client'
6+
import type MqttClient from '../client'
67
import { BufferedDuplex } from '../BufferedDuplex'
78

89
/* global wx */

‎src/lib/handlers/ack.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Other Socket Errors: EADDRINUSE, ECONNRESET, ENOTFOUND, ETIMEDOUT.
22

3-
import { PacketHandler, ErrorWithReasonCode } from '../shared'
3+
import { type PacketHandler, ErrorWithReasonCode } from '../shared'
44

55
export const ReasonCodes = {
66
0: '',

‎src/lib/handlers/auth.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { IAuthPacket } from 'mqtt-packet'
2-
import { ErrorWithReasonCode, PacketHandler } from '../shared'
1+
import { type IAuthPacket } from 'mqtt-packet'
2+
import { ErrorWithReasonCode, type PacketHandler } from '../shared'
33
import { ReasonCodes } from './ack'
44

55
const handleAuth: PacketHandler = (

‎src/lib/handlers/connack.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ReasonCodes } from './ack'
22
import TopicAliasSend from '../topic-alias-send'
3-
import { ErrorWithReasonCode, PacketHandler } from '../shared'
4-
import { IConnackPacket } from 'mqtt-packet'
3+
import { ErrorWithReasonCode, type PacketHandler } from '../shared'
4+
import { type IConnackPacket } from 'mqtt-packet'
55

66
const handleConnack: PacketHandler = (client, packet: IConnackPacket) => {
77
client.log('_handleConnack')

‎src/lib/handlers/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import handleAuth from './auth'
33
import handleConnack from './connack'
44
import handleAck from './ack'
55
import handlePubrel from './pubrel'
6-
import { PacketHandler } from '../shared'
6+
import { type PacketHandler } from '../shared'
77

88
const handle: PacketHandler = (client, packet, done) => {
99
const { options } = client

‎src/lib/handlers/publish.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { IPublishPacket } from 'mqtt-packet'
2-
import { PacketHandler } from '../shared'
1+
import { type IPublishPacket } from 'mqtt-packet'
2+
import { type PacketHandler } from '../shared'
33

44
const validReasonCodes = [0, 16, 128, 131, 135, 144, 145, 151, 153]
55

‎src/lib/handlers/pubrel.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
import { IPubcompPacket, IPublishPacket, IPubrelPacket } from 'mqtt-packet'
2-
import { PacketHandler } from '../shared'
1+
import {
2+
type IPubcompPacket,
3+
type IPublishPacket,
4+
type IPubrelPacket,
5+
} from 'mqtt-packet'
6+
import { type PacketHandler } from '../shared'
37

48
const handlePubrel: PacketHandler = (client, packet: IPubrelPacket, done) => {
59
client.log('handling pubrel packet')

‎src/lib/store.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
* Module dependencies
33
*/
44
import { Readable } from 'readable-stream'
5-
import { Packet } from 'mqtt-packet'
6-
import { DoneCallback } from './shared'
5+
import { type Packet } from 'mqtt-packet'
6+
import { type DoneCallback } from './shared'
77

88
const streamsOpts = { objectMode: true }
99
const defaultStoreOptions = {

‎src/lib/unique-message-id-provider.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { NumberAllocator } from 'number-allocator'
2-
import { IMessageIdProvider } from './default-message-id-provider'
2+
import { type IMessageIdProvider } from './default-message-id-provider'
33

44
/**
55
* UniqueMessageAllocator constructor

‎test/node/abstract_client.ts

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,19 @@ import TeardownHelper from './helpers/TeardownHelper'
1212
import handle from '../../src/lib/handlers/index'
1313
import handlePublish from '../../src/lib/handlers/publish'
1414
import mqtt, {
15-
IClientOptions,
16-
IClientPublishOptions,
17-
IClientSubscribeOptions,
18-
ISubscriptionMap,
19-
ISubscriptionRequest,
15+
type IClientOptions,
16+
type IClientPublishOptions,
17+
type IClientSubscribeOptions,
18+
type ISubscriptionMap,
19+
type ISubscriptionRequest,
2020
} from '../../src'
21-
import { IPublishPacket, IPubrelPacket, ISubackPacket, QoS } from 'mqtt-packet'
22-
import { DoneCallback, ErrorWithReasonCode } from 'src/lib/shared'
21+
import {
22+
type IPublishPacket,
23+
type IPubrelPacket,
24+
type ISubackPacket,
25+
type QoS,
26+
} from 'mqtt-packet'
27+
import { type DoneCallback, ErrorWithReasonCode } from 'src/lib/shared'
2328
import { fail } from 'assert'
2429
import { describe, it, beforeEach, afterEach, after } from 'node:test'
2530

‎test/node/abstract_store.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { IPublishPacket, IPubrelPacket } from 'mqtt-packet'
2-
import { IStore } from '../../src'
1+
import { type IPublishPacket, type IPubrelPacket } from 'mqtt-packet'
2+
import { type IStore } from '../../src'
33
import 'should'
44
import { it, beforeEach, afterEach } from 'node:test'
55

‎test/node/client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import serverBuilder from './server_helpers_for_client_tests'
1414
import _debug from 'debug'
1515
import { MqttServer } from './server'
1616
import abstractClientTests from './abstract_client'
17-
import { IClientOptions } from 'src/lib/client'
17+
import { type IClientOptions } from 'src/lib/client'
1818
import { describe, it, after } from 'node:test'
1919

2020
// eslint-disable-next-line @typescript-eslint/no-var-requires

‎test/node/client_mqtt5.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import abstractClientTests from './abstract_client'
33
import { MqttServer } from './server'
44
import serverBuilder from './server_helpers_for_client_tests'
55
import getPorts from './helpers/port_list'
6-
import mqtt, { ErrorWithReasonCode } from '../../src'
6+
import mqtt, { type ErrorWithReasonCode } from '../../src'
77
import { after, describe, it } from 'node:test'
88

99
const ports = getPorts(1)

‎test/node/helpers/TeardownHelper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { MqttClient } from 'src'
22
import { randomUUID } from 'node:crypto'
33
import { isAsyncFunction } from 'node:util/types'
4-
import serverBuilder from '../server_helpers_for_client_tests'
4+
import type serverBuilder from '../server_helpers_for_client_tests'
55

66
type ServerBuilderInstance = ReturnType<typeof serverBuilder>
77

‎test/node/keepaliveManager.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { afterEach, beforeEach, describe, it } from 'node:test'
22
import KeepaliveManager from '../../src/lib/KeepaliveManager'
33
import { assert } from 'chai'
44
import { useFakeTimers, spy, stub } from 'sinon'
5-
import { MqttClient } from 'src'
5+
import { type MqttClient } from 'src'
66

77
function mockedClient(keepalive: number) {
88
return {

‎test/node/mqtt.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import fs from 'fs'
22
import path from 'path'
3-
import mqtt, { IClientOptions } from '../../src'
3+
import mqtt, { type IClientOptions } from '../../src'
44
import { describe, it } from 'node:test'
55
import 'should'
66

‎test/node/secure_client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import path from 'path'
22
import fs from 'fs'
33
import mqtt from '../../src'
44
import abstractClientTests from './abstract_client'
5-
import { MqttSecureServer, MqttServerListener } from './server'
5+
import { MqttSecureServer, type MqttServerListener } from './server'
66
import { assert } from 'chai'
77
import 'should'
88
import { describe, it, after } from 'node:test'

‎test/node/server.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import net from 'net'
2-
import tls, { TlsOptions } from 'tls'
2+
import tls, { type TlsOptions } from 'tls'
33
import Connection from 'mqtt-connection'
4-
import { Duplex } from 'stream'
4+
import { type Duplex } from 'stream'
55

66
export type MqttServerListener = (client: Connection) => void
77

‎test/node/server_helpers_for_client_tests.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { MqttServer, MqttSecureServer, MqttServerListener } from './server'
1+
import { MqttServer, MqttSecureServer, type MqttServerListener } from './server'
22
import _debug from 'debug'
33

44
import path from 'path'
@@ -7,7 +7,7 @@ import fs from 'fs'
77
import http from 'http'
88
import WebSocket from 'ws'
99
import MQTTConnection from 'mqtt-connection'
10-
import { Server } from 'net'
10+
import { type Server } from 'net'
1111

1212
const KEY = path.join(__dirname, 'helpers', 'tls-key.pem')
1313
const CERT = path.join(__dirname, 'helpers', 'tls-cert.pem')

‎test/node/socks.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import assert from 'assert'
2-
import { AddressInfo, createServer, Server, Socket } from 'net'
2+
import { type AddressInfo, createServer, type Server, type Socket } from 'net'
33
import { describe, it, mock, afterEach, beforeEach } from 'node:test'
44
import openSocks from 'src/lib/connect/socks'
55

0 commit comments

Comments
 (0)