Skip to content

Commit 9b51037

Browse files
authored
eslint: enable recommended ruleset (#3263)
1 parent 5a8b1a7 commit 9b51037

File tree

18 files changed

+51
-40
lines changed

18 files changed

+51
-40
lines changed

.eslintrc

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"plugins": ["@typescript-eslint", "prettier"],
33
"parser": "@typescript-eslint/parser",
4-
"extends": ["plugin:prettier/recommended", "prettier"],
4+
"extends": ["eslint:recommended", "plugin:prettier/recommended", "prettier"],
55
"ignorePatterns": ["node_modules", "coverage", "packages/pg-protocol/dist/**/*", "packages/pg-query-stream/dist/**/*"],
66
"parserOptions": {
77
"ecmaVersion": 2017,
@@ -17,5 +17,13 @@
1717
"args": "none"
1818
}],
1919
"no-unused-vars": "off"
20-
}
20+
},
21+
"overrides": [
22+
{
23+
"files": ["*.ts", "*.mts", "*.cts", "*.tsx"],
24+
"rules": {
25+
"no-undef": "off"
26+
}
27+
}
28+
]
2129
}

packages/pg-cloudflare/src/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ export class CloudflareSocket extends EventEmitter {
6161
}
6262

6363
async _listen() {
64+
// eslint-disable-next-line no-constant-condition
6465
while (true) {
6566
log('awaiting receive from CF socket')
6667
const { done, value } = await this._cfReader!.read()

packages/pg-connection-string/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ function parse(str) {
1919
let dummyHost = false
2020
if (/ |%[^a-f0-9]|%[a-f0-9][^a-f0-9]/i.test(str)) {
2121
// Ensure spaces are encoded as %20
22-
str = encodeURI(str).replace(/\%25(\d\d)/g, '%$1')
22+
str = encodeURI(str).replace(/%25(\d\d)/g, '%$1')
2323
}
2424

2525
try {

packages/pg-native/index.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,10 @@ Client.prototype._emitResult = function (pq) {
183183
case 'PGRES_TUPLES_OK':
184184
case 'PGRES_COMMAND_OK':
185185
case 'PGRES_EMPTY_QUERY':
186-
const result = this._consumeQueryResults(this.pq)
187-
this.emit('result', result)
186+
{
187+
const result = this._consumeQueryResults(this.pq)
188+
this.emit('result', result)
189+
}
188190
break
189191

190192
case 'PGRES_COPY_OUT':

packages/pg-pool/test/idle-timeout-exit.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ if (module === require.main) {
1111
pool.query('SELECT NOW()', (err, res) => console.log('completed first'))
1212
pool.on('remove', () => {
1313
console.log('removed')
14-
done()
1514
})
1615

1716
setTimeout(() => {

packages/pg-protocol/src/buffer-reader.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export class BufferReader {
4646
public cstring(): string {
4747
const start = this.offset
4848
let end = start
49+
// eslint-disable-next-line no-empty
4950
while (this.buffer[end++] !== 0) {}
5051
this.offset = end
5152
return this.buffer.toString(this.encoding, start, end - 1)

packages/pg-protocol/src/inbound-parser.test.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,8 @@ var rowWithBigOids = {
5050
}
5151
var bigOidDescBuff = buffers.rowDescription([rowWithBigOids])
5252

53-
var emptyRowFieldBuf = new BufferList().addInt16(0).join(true, 'D')
54-
5553
var emptyRowFieldBuf = buffers.dataRow([])
5654

57-
var oneFieldBuf = new BufferList()
58-
.addInt16(1) // number of fields
59-
.addInt32(5) // length of bytes of fields
60-
.addCString('test')
61-
.join(true, 'D')
62-
6355
var oneFieldBuf = buffers.dataRow(['test'])
6456

6557
var expectedAuthenticationOkayMessage = {

packages/pg-protocol/src/parser.ts

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -328,16 +328,17 @@ export class Parser {
328328
}
329329
break
330330
case 10: // AuthenticationSASL
331-
message.name = 'authenticationSASL'
332-
message.mechanisms = []
333-
let mechanism: string
334-
do {
335-
mechanism = this.reader.cstring()
336-
337-
if (mechanism) {
338-
message.mechanisms.push(mechanism)
339-
}
340-
} while (mechanism)
331+
{
332+
message.name = 'authenticationSASL'
333+
message.mechanisms = []
334+
let mechanism: string
335+
do {
336+
mechanism = this.reader.cstring()
337+
if (mechanism) {
338+
message.mechanisms.push(mechanism)
339+
}
340+
} while (mechanism)
341+
}
341342
break
342343
case 11: // AuthenticationSASLContinue
343344
message.name = 'authenticationSASLContinue'

packages/pg-query-stream/test/error.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ describe('error recovery', () => {
7575
const client = new Client()
7676
const stmt = 'SELECT * FROM goose;'
7777
await client.connect()
78-
return new Promise(async (resolve) => {
78+
return new Promise((resolve) => {
7979
let queryError: Error | undefined
8080
client.query(stmt).catch((e) => {
8181
queryError = e
@@ -86,7 +86,7 @@ describe('error recovery', () => {
8686
assert(queryError, 'query should have errored due to client ending')
8787
resolve()
8888
})
89-
await client.end()
89+
client.end()
9090
})
9191
})
9292

packages/pg/bench.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ const exec = async (client, q) => {
2525
const bench = async (client, q, time) => {
2626
let start = Date.now()
2727
let count = 0
28+
// eslint-disable-next-line no-constant-condition
2829
while (true) {
2930
await exec(client, q)
3031
count++

0 commit comments

Comments
 (0)