Skip to content

Commit 82477d7

Browse files
UzlopakUzlopak
authored
chore: fix various codesmells (#2669)
* chore: fix two codesmells * fix more code smells
1 parent 2144da4 commit 82477d7

12 files changed

Lines changed: 46 additions & 49 deletions

File tree

‎lib/client.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -370,10 +370,10 @@ class Client extends DispatcherBase {
370370
// TODO: for H2 we need to gracefully flush the remaining enqueued
371371
// request and close each stream.
372372
return new Promise((resolve) => {
373-
if (!this[kSize]) {
374-
resolve(null)
375-
} else {
373+
if (this[kSize]) {
376374
this[kClosedResolve] = resolve
375+
} else {
376+
resolve(null)
377377
}
378378
})
379379
}
@@ -401,10 +401,10 @@ class Client extends DispatcherBase {
401401
this[kHTTP2SessionState] = null
402402
}
403403

404-
if (!this[kSocket]) {
405-
queueMicrotask(callback)
406-
} else {
404+
if (this[kSocket]) {
407405
util.destroy(this[kSocket].on('close', callback), err)
406+
} else {
407+
queueMicrotask(callback)
408408
}
409409

410410
resume(this)

‎lib/core/request.js‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -369,8 +369,11 @@ class Request {
369369

370370
if (value == null || value.length === 0) continue
371371

372-
if (headers[key]) headers[key] += `,${value}`
373-
else headers[key] = value
372+
if (headers[key]) {
373+
headers[key] += `,${value}`
374+
} else {
375+
headers[key] = value
376+
}
374377
}
375378

376379
return headers
@@ -433,20 +436,22 @@ function processHeader (request, key, val, skipAppend = false) {
433436
}
434437
} else if (headerName === 'expect') {
435438
throw new NotSupportedError('expect header not supported')
436-
} else {
437-
if (Array.isArray(val)) {
438-
for (let i = 0; i < val.length; i++) {
439-
if (skipAppend) {
440-
if (request.headers[key]) request.headers[key] += `,${processHeaderValue(key, val[i], skipAppend)}`
441-
else request.headers[key] = processHeaderValue(key, val[i], skipAppend)
439+
} else if (Array.isArray(val)) {
440+
for (let i = 0; i < val.length; i++) {
441+
if (skipAppend) {
442+
if (request.headers[key]) {
443+
request.headers[key] += `,${processHeaderValue(key, val[i], skipAppend)}`
442444
} else {
443-
request.headers += processHeaderValue(key, val[i])
445+
request.headers[key] = processHeaderValue(key, val[i], skipAppend)
444446
}
447+
} else {
448+
request.headers += processHeaderValue(key, val[i])
445449
}
446-
} else {
447-
if (skipAppend) request.headers[key] = processHeaderValue(key, val, skipAppend)
448-
else request.headers += processHeaderValue(key, val)
449450
}
451+
} else if (skipAppend) {
452+
request.headers[key] = processHeaderValue(key, val, skipAppend)
453+
} else {
454+
request.headers += processHeaderValue(key, val)
450455
}
451456
}
452457

‎lib/core/tree.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,10 @@ class TstNode {
5757
} else {
5858
this.left = new TstNode(key, value, index)
5959
}
60+
} else if (this.right !== null) {
61+
this.right.add(key, value, index)
6062
} else {
61-
if (this.right !== null) {
62-
this.right.add(key, value, index)
63-
} else {
64-
this.right = new TstNode(key, value, index)
65-
}
63+
this.right = new TstNode(key, value, index)
6664
}
6765
}
6866

‎lib/core/util.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -254,19 +254,19 @@ function parseHeaders (headers, obj) {
254254
const key = headerNameToString(headers[i])
255255
let val = obj[key]
256256

257-
if (!val) {
257+
if (val) {
258+
if (typeof val === 'string') {
259+
val = [val]
260+
obj[key] = val
261+
}
262+
val.push(headers[i + 1].toString('utf8'))
263+
} else {
258264
const headersValue = headers[i + 1]
259265
if (typeof headersValue === 'string') {
260266
obj[key] = headersValue
261267
} else {
262268
obj[key] = Array.isArray(headersValue) ? headersValue.map(x => x.toString('utf8')) : headersValue.toString('utf8')
263269
}
264-
} else {
265-
if (typeof val === 'string') {
266-
val = [val]
267-
obj[key] = val
268-
}
269-
val.push(headers[i + 1].toString('utf8'))
270270
}
271271
}
272272

‎lib/eventsource/eventsource-stream.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ class EventSourceStream extends Transform {
337337
if (event[field] === undefined) {
338338
event[field] = value
339339
} else {
340-
event[field] += '\n' + value
340+
event[field] += `\n${value}`
341341
}
342342
break
343343
case 'retry':

‎lib/fetch/body.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ function extractBody (object, keepalive = false) {
167167
// Set type to `multipart/form-data; boundary=`,
168168
// followed by the multipart/form-data boundary string generated
169169
// by the multipart/form-data encoding algorithm.
170-
type = 'multipart/form-data; boundary=' + boundary
170+
type = `multipart/form-data; boundary=${boundary}`
171171
} else if (isBlobLike(object)) {
172172
// Blob
173173

@@ -455,7 +455,7 @@ function bodyMixinMethods (instance) {
455455
} catch (err) {
456456
// istanbul ignore next: Unclear when new URLSearchParams can fail on a string.
457457
// 2. If entries is failure, then throw a TypeError.
458-
throw Object.assign(new TypeError(), { cause: err })
458+
throw new TypeError(undefined, { cause: err })
459459
}
460460

461461
// 3. Return a new FormData object whose entries are entries.

‎lib/fetch/file.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -283,12 +283,12 @@ function processBlobParts (parts, options) {
283283
// 2. If element is a BufferSource, get a copy of the
284284
// bytes held by the buffer source, and append those
285285
// bytes to bytes.
286-
if (!element.buffer) { // ArrayBuffer
287-
bytes.push(new Uint8Array(element))
288-
} else {
286+
if (element.buffer) {
289287
bytes.push(
290288
new Uint8Array(element.buffer, element.byteOffset, element.byteLength)
291289
)
290+
} else { // ArrayBuffer
291+
bytes.push(new Uint8Array(element))
292292
}
293293
} else if (isBlobLike(element)) {
294294
// 3. If element is a Blob, append the bytes it represents

‎lib/fetch/index.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,7 @@ function fetch (input, init = undefined) {
224224
// 3. If response is a network error, then reject p with a TypeError
225225
// and terminate these substeps.
226226
if (response.type === 'error') {
227-
p.reject(
228-
Object.assign(new TypeError('fetch failed'), { cause: response.error })
229-
)
227+
p.reject(new TypeError('fetch failed', { cause: response.error }))
230228
return Promise.resolve()
231229
}
232230

‎lib/fetch/response.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,12 @@ class Response {
8888
try {
8989
parsedURL = new URL(url, getGlobalOrigin())
9090
} catch (err) {
91-
throw Object.assign(new TypeError('Failed to parse URL from ' + url), {
92-
cause: err
93-
})
91+
throw new TypeError(`Failed to parse URL from ${url}`, { cause: err })
9492
}
9593

9694
// 3. If status is not a redirect status, then throw a RangeError.
9795
if (!redirectStatusSet.has(status)) {
98-
throw new RangeError('Invalid status code ' + status)
96+
throw new RangeError(`Invalid status code ${status}`)
9997
}
10098

10199
// 4. Let responseObject be the result of creating a Response object,
@@ -472,7 +470,7 @@ function initializeResponse (response, init, body) {
472470
if (nullBodyStatus.includes(response.status)) {
473471
throw webidl.errors.exception({
474472
header: 'Response constructor',
475-
message: 'Invalid response status code ' + response.status
473+
message: `Invalid response status code ${response.status}`
476474
})
477475
}
478476

‎lib/handler/RetryHandler.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ class RetryHandler {
151151
let retryAfterHeader = headers != null && headers['retry-after']
152152
if (retryAfterHeader) {
153153
retryAfterHeader = Number(retryAfterHeader)
154-
retryAfterHeader = isNaN(retryAfterHeader)
154+
retryAfterHeader = Number.isNaN(retryAfterHeader)
155155
? calculateRetryAfterHeader(retryAfterHeader)
156156
: retryAfterHeader * 1e3 // Retry-After is in seconds
157157
}

0 commit comments

Comments
 (0)