From 6caa47dbfea739e5cfd03e40db1c5083d15d97e0 Mon Sep 17 00:00:00 2001 From: Pavel Zavora Date: Mon, 11 Jul 2022 13:03:56 +0200 Subject: [PATCH] chore: apply prettier v2 formatting --- examples/createBucket.js | 2 +- examples/delete.ts | 2 +- examples/follow-redirects.js | 6 +- examples/giraffe.html | 116 ++++++++++-------- examples/index.html | 99 ++++++++------- examples/influxdb-1.8.ts | 2 +- examples/invokableScripts.js | 4 +- examples/onboarding.js | 2 +- examples/ping.js | 2 +- examples/scripts/monitor.js | 7 +- examples/tokens.js | 6 +- examples/write.js | 2 +- examples/writeAdvanced.js | 4 +- packages/apis/generator/generateApi.ts | 8 +- packages/apis/generator/typesCollector.ts | 8 +- packages/apis/scripts/fetchSwaggerFiles.js | 15 +-- packages/apis/scripts/patchSwagger.js | 2 +- packages/apis/src/APIBase.ts | 5 +- .../apis/src/generated/ReplicationsAPI.ts | 7 +- packages/apis/src/generated/SourcesAPI.ts | 7 +- .../custom/FluxScriptInvocationAPI.test.ts | 6 +- .../apis/test/unit/typesCollector.test.ts | 2 +- packages/core/.nycrc | 20 +-- packages/core/src/Point.ts | 4 +- packages/core/src/impl/RetryBuffer.ts | 8 +- packages/core/src/impl/WriteApiImpl.ts | 8 +- .../core/src/impl/browser/FetchTransport.ts | 6 +- .../core/src/impl/node/NodeHttpTransport.ts | 12 +- packages/core/src/options.ts | 4 +- .../src/results/AnnotatedCSVResponseImpl.ts | 4 +- packages/core/src/results/ObservableQuery.ts | 6 +- packages/core/src/util/escape.ts | 2 +- .../test/integration/rxjs/QueryApi.test.ts | 6 +- packages/core/test/unit/Influxdb.test.ts | 28 +++-- packages/core/test/unit/Point.test.ts | 4 +- packages/core/test/unit/QueryApi.test.ts | 2 +- packages/core/test/unit/WriteApi.test.ts | 36 +++--- packages/core/test/unit/errors.test.ts | 10 +- .../test/unit/impl/ObservableQuery.test.ts | 42 +++---- .../unit/impl/browser/FetchTransport.test.ts | 49 +++----- .../test/unit/impl/browser/emulateBrowser.ts | 6 +- .../unit/impl/node/NodeHttpTransport.test.ts | 115 +++++++---------- .../core/test/unit/impl/retryStrategy.test.ts | 9 +- packages/core/test/unit/query/flux.test.ts | 14 +-- .../test/unit/results/chunkCombiner.test.ts | 2 +- .../test/unit/results/chunksToLines.test.ts | 2 +- .../test/unit/results/stringToLines.test.ts | 4 +- packages/core/test/unit/util/logger.test.ts | 64 +++++----- .../core/test/unit/util/waitForCondition.ts | 2 +- packages/core/test/util.ts | 8 +- packages/giraffe/.nycrc | 20 +-- packages/giraffe/src/csvToTable.ts | 13 +- packages/giraffe/src/queryTable.ts | 2 +- packages/giraffe/test/unit/csvToTable.test.ts | 15 +-- packages/giraffe/test/unit/queryTable.test.ts | 69 +++-------- 55 files changed, 412 insertions(+), 498 deletions(-) diff --git a/examples/createBucket.js b/examples/createBucket.js index f8fea6965..ca5f0bd5b 100755 --- a/examples/createBucket.js +++ b/examples/createBucket.js @@ -51,7 +51,7 @@ async function recreateBucket(name) { recreateBucket('example-bucket') .then(() => console.log('\nFinished SUCCESS')) - .catch(error => { + .catch((error) => { console.error(error) console.log('\nFinished ERROR') }) diff --git a/examples/delete.ts b/examples/delete.ts index 22e368045..7c22fb968 100755 --- a/examples/delete.ts +++ b/examples/delete.ts @@ -44,7 +44,7 @@ async function deleteData(): Promise { deleteData() .then(() => console.log('\nFinished SUCCESS')) - .catch(error => { + .catch((error) => { console.error(error) console.log('\nFinished ERROR') }) diff --git a/examples/follow-redirects.js b/examples/follow-redirects.js index 9ecce5ebf..4b0dc8578 100755 --- a/examples/follow-redirects.js +++ b/examples/follow-redirects.js @@ -32,12 +32,12 @@ server.listen(0, 'localhost', () => { }).getQueryApi(org) queryApi .collectRows('buckets()') - .then(data => { + .then((data) => { console.info('Available buckets:') - data.forEach(x => console.info('', x.name)) + data.forEach((x) => console.info('', x.name)) console.log('\nQuery SUCCESS') }) - .catch(error => { + .catch((error) => { console.error(error) console.log('\nQuery ERROR') }) diff --git a/examples/giraffe.html b/examples/giraffe.html index aa916478f..fcba999c3 100644 --- a/examples/giraffe.html +++ b/examples/giraffe.html @@ -4,7 +4,7 @@

InfluxDB JavaScript Client Examples

-
+
-
+
Temperature: - +
-
-
- +
+
+
-
+
Log - +
diff --git a/examples/influxdb-1.8.ts b/examples/influxdb-1.8.ts index 6d2667e8e..2edc6fc85 100755 --- a/examples/influxdb-1.8.ts +++ b/examples/influxdb-1.8.ts @@ -34,7 +34,7 @@ writeAPI.writePoint(point) writeAPI .close() .then(() => console.log('Write FINISHED')) - .catch(error => { + .catch((error) => { console.error(error) }) diff --git a/examples/invokableScripts.js b/examples/invokableScripts.js index 964069668..c6c4e6a46 100755 --- a/examples/invokableScripts.js +++ b/examples/invokableScripts.js @@ -48,7 +48,7 @@ async function deleteScript(id) { console.log('*** Delete example script ***') if (!id) { const scripts = (await scriptsAPI.getScripts()).scripts - id = scripts.find(x => x.name === scriptName)?.id + id = scripts.find((x) => x.name === scriptName)?.id } if (id) { await scriptsAPI.deleteScriptsID({scriptID: id}) @@ -105,7 +105,7 @@ async function example() { example() .then(() => console.log('\nFinished SUCCESS')) - .catch(error => { + .catch((error) => { if (error instanceof HttpError && error.statusCode === 404) { console.error( `API invokable scripts are not supported by InfluxDB at ${url} .` diff --git a/examples/onboarding.js b/examples/onboarding.js index f5707789f..7557b256a 100755 --- a/examples/onboarding.js +++ b/examples/onboarding.js @@ -31,7 +31,7 @@ setupApi } console.log('\nFinished SUCCESS') }) - .catch(error => { + .catch((error) => { console.error(error) console.log('\nFinished ERROR') }) diff --git a/examples/ping.js b/examples/ping.js index 81772ad85..d7dc3a0e0 100755 --- a/examples/ping.js +++ b/examples/ping.js @@ -21,7 +21,7 @@ pingAPI .then(() => { console.log('\nPing SUCCESS') }) - .catch(error => { + .catch((error) => { console.error(error) console.log('\nFinished ERROR') }) diff --git a/examples/scripts/monitor.js b/examples/scripts/monitor.js index b6c2b6097..08dcf472d 100644 --- a/examples/scripts/monitor.js +++ b/examples/scripts/monitor.js @@ -52,13 +52,14 @@ process.on('SIGINT', onShutdown) process.on('SIGTERM', onShutdown) // export a monitoring function for express.js response time monitoring -module.exports = function(app) { +module.exports = function (app) { app.use( responseTime((req, res, time) => { // print out request basics console.info( - `${req.method} ${req.path} ${res.statusCode} ${Math.round(time * 100) / - 100}ms` + `${req.method} ${req.path} ${res.statusCode} ${ + Math.round(time * 100) / 100 + }ms` ) // write response time to InfluxDB const point = new Point('express_http_server') diff --git a/examples/tokens.js b/examples/tokens.js index 76cf8271f..f8267f35f 100755 --- a/examples/tokens.js +++ b/examples/tokens.js @@ -32,7 +32,7 @@ async function signInDemo() { if (typeof setCookie === 'string') { cookies.push(setCookie.split(';').shift()) } else if (Array.isArray(setCookie)) { - setCookie.forEach(c => cookies.push(c.split(';').shift())) + setCookie.forEach((c) => cookies.push(c.split(';').shift())) } } }, @@ -47,7 +47,7 @@ async function signInDemo() { const authorizations = await authorizationAPI.getAuthorizations({}, session) // console.log(JSON.stringify(authorizations?.authorizations, null, 2)) let exampleTokenID = undefined - ;(authorizations.authorizations || []).forEach(auth => { + ;(authorizations.authorizations || []).forEach((auth) => { console.log(auth.description) // console.log(auth.token) // token cannot be retrieved in the cloud if (auth.description === 'example token') { @@ -101,7 +101,7 @@ async function signInDemo() { console.log('Signout SUCCESS') } -signInDemo().catch(error => { +signInDemo().catch((error) => { console.error(error) console.log('\nFinished ERROR') }) diff --git a/examples/write.js b/examples/write.js index a871e9c50..a8b30e1c4 100755 --- a/examples/write.js +++ b/examples/write.js @@ -38,7 +38,7 @@ writeApi .then(() => { console.log('FINISHED ... now try ./query.ts') }) - .catch(e => { + .catch((e) => { console.error(e) if (e instanceof HttpError && e.statusCode === 401) { console.log('Run ./onboarding.js to setup a new InfluxDB database.') diff --git a/examples/writeAdvanced.js b/examples/writeAdvanced.js index 096de0250..11297420d 100755 --- a/examples/writeAdvanced.js +++ b/examples/writeAdvanced.js @@ -103,7 +103,7 @@ async function importData() { .collectRows(countQuery, (row, tableMeta) => Number.parseInt(row[tableMeta.column('_value').index]) ) - .then(results => results.reduce((acc, val) => acc + val, 0)) + .then((results) => results.reduce((acc, val) => acc + val, 0)) console.log(`Size of temperature2 measurement since '${start}': `, count) } @@ -114,4 +114,4 @@ importData() `FINISHED writing ${demoCount} points (${Date.now() - start} millis}` ) ) - .catch(e => console.error('FINISHED', e)) + .catch((e) => console.error('FINISHED', e)) diff --git a/packages/apis/generator/generateApi.ts b/packages/apis/generator/generateApi.ts index b20cb3a73..c2af4a0d5 100644 --- a/packages/apis/generator/generateApi.ts +++ b/packages/apis/generator/generateApi.ts @@ -5,7 +5,7 @@ import logger from './logger' function getResponse(operation: Operation): Response { const validResponse: Array = operation.responses.filter( - x => x.code === 'default' || x.code < '300' + (x) => x.code === 'default' || x.code < '300' ) if (validResponse.length > 1) { if ( @@ -14,7 +14,7 @@ function getResponse(operation: Operation): Response { ) { logger.warn( `more OK responses available for ${operation.path}: ${validResponse - .map(x => x.code) + .map((x) => x.code) .join(',')}` ) } @@ -84,7 +84,7 @@ function requestRequired(operation: Operation): boolean { if ( operation.queryParams && operation.queryParams.length && - operation.queryParams.some(x => x.required) + operation.queryParams.some((x) => x.required) ) { return true } @@ -153,7 +153,7 @@ export class ${apiName} { )}${ operation.queryParams.length ? '${this.base.queryString(request,[' + - operation.queryParams.map(x => "'" + x.name + "'").join(',') + + operation.queryParams.map((x) => "'" + x.name + "'").join(',') + '])}' : '' }\`, request, requestOptions${ diff --git a/packages/apis/generator/typesCollector.ts b/packages/apis/generator/typesCollector.ts index 4b97c7ec1..8ac5eb7cd 100644 --- a/packages/apis/generator/typesCollector.ts +++ b/packages/apis/generator/typesCollector.ts @@ -19,17 +19,15 @@ export default class TypesCollector { } else if (type.includes('|')) { type .split('|') - .map(x => x.trim()) - .forEach(x => this.add(x)) + .map((x) => x.trim()) + .forEach((x) => this.add(x)) } else { this.types[type] = true } } } toString(): string { - return Object.keys(this.types) - .sort() - .join(', ') + return Object.keys(this.types).sort().join(', ') } hasTypes(): boolean { return !!Object.keys(this.types).length diff --git a/packages/apis/scripts/fetchSwaggerFiles.js b/packages/apis/scripts/fetchSwaggerFiles.js index 0cbf4427f..abf530b1b 100644 --- a/packages/apis/scripts/fetchSwaggerFiles.js +++ b/packages/apis/scripts/fetchSwaggerFiles.js @@ -8,10 +8,10 @@ const {writeFile} = require('fs/promises') function downloadFile(url) { return new Promise((resolve, reject) => { https - .get(url, function(res) { + .get(url, function (res) { const data = [] res - .on('data', chunk => { + .on('data', (chunk) => { data.push(chunk) }) .on('end', () => { @@ -25,18 +25,15 @@ function downloadFile(url) { const FILES = [ { file: 'resources/oss.yml', - url: - 'https://raw.githubusercontent.com/influxdata/openapi/master/contracts/oss.yml', + url: 'https://raw.githubusercontent.com/influxdata/openapi/master/contracts/oss.yml', }, { file: 'resources/invocable-scripts.yml', - url: - 'https://raw.githubusercontent.com/influxdata/openapi/master/contracts/invocable-scripts.yml', + url: 'https://raw.githubusercontent.com/influxdata/openapi/master/contracts/invocable-scripts.yml', }, { file: 'resources/cloud.yml', - url: - 'https://raw.githubusercontent.com/influxdata/openapi/master/contracts/cloud.yml', + url: 'https://raw.githubusercontent.com/influxdata/openapi/master/contracts/cloud.yml', }, ] async function downloadFiles() { @@ -51,7 +48,7 @@ async function downloadFiles() { downloadFiles() .then(() => console.log('\nFinished SUCCESS')) - .catch(error => { + .catch((error) => { console.error(error) console.log('\nFinished ERROR') process.exitCode = 1 diff --git a/packages/apis/scripts/patchSwagger.js b/packages/apis/scripts/patchSwagger.js index 6781a0449..460424f26 100644 --- a/packages/apis/scripts/patchSwagger.js +++ b/packages/apis/scripts/patchSwagger.js @@ -6,7 +6,7 @@ exports.patch = async (doc, SwaggerParser) => { cloudApi.components.schemas['Resource']['properties']['type'] const ossTypes = doc.components.schemas['Resource']['properties']['type'] ossTypes.enum = ossTypes.enum.concat( - cloudTypes.enum.filter(cloudType => !ossTypes.enum.includes(cloudType)) + cloudTypes.enum.filter((cloudType) => !ossTypes.enum.includes(cloudType)) ) return doc diff --git a/packages/apis/src/APIBase.ts b/packages/apis/src/APIBase.ts index 8ec36bbd2..c25cfa9d2 100644 --- a/packages/apis/src/APIBase.ts +++ b/packages/apis/src/APIBase.ts @@ -67,9 +67,8 @@ export class APIBase { method, } if (mediaType) { - ;(sendOptions.headers || (sendOptions.headers = {}))[ - 'content-type' - ] = mediaType + ;(sendOptions.headers || (sendOptions.headers = {}))['content-type'] = + mediaType } if (request.auth) { const value = `${request.auth.user}:${request.auth.password}` diff --git a/packages/apis/src/generated/ReplicationsAPI.ts b/packages/apis/src/generated/ReplicationsAPI.ts index b77339cdb..ba6f83c8f 100644 --- a/packages/apis/src/generated/ReplicationsAPI.ts +++ b/packages/apis/src/generated/ReplicationsAPI.ts @@ -123,9 +123,10 @@ export class ReplicationsAPI { ): Promise { return this.base.request( 'PATCH', - `/api/v2/replications/${ - request.replicationID - }${this.base.queryString(request, ['validate'])}`, + `/api/v2/replications/${request.replicationID}${this.base.queryString( + request, + ['validate'] + )}`, request, requestOptions, 'application/json' diff --git a/packages/apis/src/generated/SourcesAPI.ts b/packages/apis/src/generated/SourcesAPI.ts index 4c8337d9f..2d81ca45c 100644 --- a/packages/apis/src/generated/SourcesAPI.ts +++ b/packages/apis/src/generated/SourcesAPI.ts @@ -171,9 +171,10 @@ export class SourcesAPI { ): Promise { return this.base.request( 'GET', - `/api/v2/sources/${ - request.sourceID - }/buckets${this.base.queryString(request, ['org'])}`, + `/api/v2/sources/${request.sourceID}/buckets${this.base.queryString( + request, + ['org'] + )}`, request, requestOptions ) diff --git a/packages/apis/test/unit/custom/FluxScriptInvocationAPI.test.ts b/packages/apis/test/unit/custom/FluxScriptInvocationAPI.test.ts index 545804771..be8b5819f 100644 --- a/packages/apis/test/unit/custom/FluxScriptInvocationAPI.test.ts +++ b/packages/apis/test/unit/custom/FluxScriptInvocationAPI.test.ts @@ -29,7 +29,7 @@ describe('FluxScriptInvocationAPI', () => { let body, authorization: any nock(fakeUrl) .post(`/api/v2/scripts/${fakeScriptID}/invoke`) - .reply(function(_uri, requestBody) { + .reply(function (_uri, requestBody) { body = requestBody authorization = this.req.headers.authorization return [200, fakeResponse] @@ -47,7 +47,7 @@ describe('FluxScriptInvocationAPI', () => { let customHeader: any nock(fakeUrl) .post(`/api/v2/scripts/${fakeScriptID}/invoke`) - .reply(function(_uri) { + .reply(function (_uri) { customHeader = this.req.headers.whatever return [200, fakeResponse, {'content-type': 'text/csv'}] }) @@ -63,7 +63,7 @@ describe('FluxScriptInvocationAPI', () => { let acceptEncoding: any nock(fakeUrl) .post(`/api/v2/scripts/${fakeScriptID}/invoke`) - .reply(function(_uri) { + .reply(function (_uri) { acceptEncoding = this.req.headers['accept-encoding'] return [ 200, diff --git a/packages/apis/test/unit/typesCollector.test.ts b/packages/apis/test/unit/typesCollector.test.ts index 225737faa..814339043 100644 --- a/packages/apis/test/unit/typesCollector.test.ts +++ b/packages/apis/test/unit/typesCollector.test.ts @@ -54,7 +54,7 @@ describe('TypesCollector', () => { result: '', }, ] - tests.forEach(test => { + tests.forEach((test) => { it(test.name, () => { const collector = new TypesCollector() test.toAdd.forEach(collector.add.bind(collector)) diff --git a/packages/core/.nycrc b/packages/core/.nycrc index 68653416c..90c0e717e 100644 --- a/packages/core/.nycrc +++ b/packages/core/.nycrc @@ -1,21 +1,11 @@ { "cache": false, "check-coverage": false, - "extension": [ - ".ts" - ], - "include": [ - "src/**/*.ts" - ], - "exclude": [ - "src/index.ts" - ], + "extension": [".ts"], + "include": ["src/**/*.ts"], + "exclude": ["src/index.ts"], "sourceMap": true, - "reporter": [ - "html", - "text", - "text-summary" - ], + "reporter": ["html", "text", "text-summary"], "all": true, "instrument": true -} \ No newline at end of file +} diff --git a/packages/core/src/Point.ts b/packages/core/src/Point.ts index 2c4809c12..ec9d93cd5 100644 --- a/packages/core/src/Point.ts +++ b/packages/core/src/Point.ts @@ -201,7 +201,7 @@ export class Point { let fieldsLine = '' Object.keys(this.fields) .sort() - .forEach(x => { + .forEach((x) => { if (x) { const val = this.fields[x] if (fieldsLine.length > 0) fieldsLine += ',' @@ -216,7 +216,7 @@ export class Point { : this.tags Object.keys(tags) .sort() - .forEach(x => { + .forEach((x) => { if (x) { const val = tags[x] if (val) { diff --git a/packages/core/src/impl/RetryBuffer.ts b/packages/core/src/impl/RetryBuffer.ts index 38737514f..3bb4ae0e9 100644 --- a/packages/core/src/impl/RetryBuffer.ts +++ b/packages/core/src/impl/RetryBuffer.ts @@ -58,9 +58,9 @@ export default class RetryBuffer { } } while (this.first && this.size + lines.length > newSize) Log.error( - `RetryBuffer: ${origSize - - this - .size} oldest lines removed to keep buffer size under the limit of ${ + `RetryBuffer: ${ + origSize - this.size + } oldest lines removed to keep buffer size under the limit of ${ this.maxLines } lines` ) @@ -102,7 +102,7 @@ export default class RetryBuffer { // continue with successfull retry this.scheduleRetry(RETRY_INTERVAL) }) - .catch(_e => { + .catch((_e) => { // already logged this.scheduleRetry(this.nextRetryTime - Date.now()) }) diff --git a/packages/core/src/impl/WriteApiImpl.ts b/packages/core/src/impl/WriteApiImpl.ts index b3643c827..afb1f2338 100644 --- a/packages/core/src/impl/WriteApiImpl.ts +++ b/packages/core/src/impl/WriteApiImpl.ts @@ -34,7 +34,7 @@ class WriteBuffer { this.scheduleSend() } else if (this.bytes + size + 1 >= this.maxBatchBytes) { // the new size already exceeds maxBatchBytes, send it - this.flush().catch(_e => { + this.flush().catch((_e) => { // an error is logged in case of failure, avoid UnhandledPromiseRejectionWarning }) } @@ -45,7 +45,7 @@ class WriteBuffer { this.length >= this.maxChunkRecords || this.bytes >= this.maxBatchBytes ) { - this.flush().catch(_e => { + this.flush().catch((_e) => { // an error is logged in case of failure, avoid UnhandledPromiseRejectionWarning }) } @@ -123,7 +123,7 @@ export default class WriteApiImpl implements WriteApi { this.sendBatch( this.writeBuffer.reset(), this.writeOptions.maxRetries - ).catch(_e => { + ).catch((_e) => { // an error is logged in case of failure, avoid UnhandledPromiseRejectionWarning }), this.writeOptions.flushInterval @@ -135,7 +135,7 @@ export default class WriteApiImpl implements WriteApi { this.writeBuffer = new WriteBuffer( this.writeOptions.batchSize, this.writeOptions.maxBatchBytes, - lines => { + (lines) => { this._clearFlushTimeout() return this.sendBatch(lines, this.writeOptions.maxRetries) }, diff --git a/packages/core/src/impl/browser/FetchTransport.ts b/packages/core/src/impl/browser/FetchTransport.ts index befe07386..c1b079f60 100644 --- a/packages/core/src/impl/browser/FetchTransport.ts +++ b/packages/core/src/impl/browser/FetchTransport.ts @@ -82,7 +82,7 @@ export default class FetchTransport implements Transport { }) } this.fetch(path, body, options) - .then(async response => { + .then(async (response) => { if (callbacks?.responseStarted) { observer.responseStarted( getResponseHeaders(response), @@ -138,7 +138,7 @@ export default class FetchTransport implements Transport { } } }) - .catch(e => { + .catch((e) => { if (!cancelled) { observer.error(e) } @@ -239,5 +239,5 @@ export default class FetchTransport implements Transport { request: RequestInit, options: SendOptions, url: string - ) => void = function() {} + ) => void = function () {} } diff --git a/packages/core/src/impl/node/NodeHttpTransport.ts b/packages/core/src/impl/node/NodeHttpTransport.ts index 33f29bde0..da9aab74e 100644 --- a/packages/core/src/impl/node/NodeHttpTransport.ts +++ b/packages/core/src/impl/node/NodeHttpTransport.ts @@ -81,7 +81,7 @@ export class NodeHttpTransport implements Transport { // remove all undefined field to avoid node validation errors // https://github.com/influxdata/influxdb-client-js/issues/380 Object.keys(this.defaultOptions).forEach( - key => + (key) => this.defaultOptions[key] === undefined && delete this.defaultOptions[key] ) @@ -244,7 +244,7 @@ export class NodeHttpTransport implements Transport { sendOptions.gzipThreshold !== undefined && sendOptions.gzipThreshold < bodyBuffer.length ) { - bodyPromise = bodyPromise.then(body => { + bodyPromise = bodyPromise.then((body) => { return new Promise((resolve, reject) => { zlib.gzip(body, (err, res) => { /* istanbul ignore next - hard to simulate failure, manually reviewed */ @@ -258,7 +258,7 @@ export class NodeHttpTransport implements Transport { }) } - return bodyPromise.then(bodyBuffer => { + return bodyPromise.then((bodyBuffer) => { options.body = bodyBuffer options.headers['content-length'] = bodyBuffer.length return options @@ -303,7 +303,7 @@ export class NodeHttpTransport implements Transport { const isJson = String(res.headers['content-type']).startsWith( 'application/json' ) - responseData.on('data', s => { + responseData.on('data', (s) => { body += s.toString() if (!isJson && body.length > 1000) { body = body.slice(0, 1000) @@ -325,7 +325,7 @@ export class NodeHttpTransport implements Transport { ) }) } else { - responseData.on('data', data => { + responseData.on('data', (data) => { if (cancellable.isCancelled()) { res.resume() } else { @@ -345,7 +345,7 @@ export class NodeHttpTransport implements Transport { req.on('timeout', () => { listeners.error(new RequestTimedOutError()) }) - req.on('error', error => { + req.on('error', (error) => { listeners.error(error) }) diff --git a/packages/core/src/options.ts b/packages/core/src/options.ts index eccaf5272..33c11e515 100644 --- a/packages/core/src/options.ts +++ b/packages/core/src/options.ts @@ -135,8 +135,8 @@ export const DEFAULT_WriteOptions: WriteOptions = { batchSize: 1000, maxBatchBytes: 50_000_000, // default max batch size in the cloud flushInterval: 60000, - writeFailed: function() {}, - writeSuccess: function() {}, + writeFailed: function () {}, + writeSuccess: function () {}, maxRetries: 5, maxRetryTime: 180_000, maxBufferLines: 32_000, diff --git a/packages/core/src/results/AnnotatedCSVResponseImpl.ts b/packages/core/src/results/AnnotatedCSVResponseImpl.ts index 49ce7b50d..e4d79b009 100644 --- a/packages/core/src/results/AnnotatedCSVResponseImpl.ts +++ b/packages/core/src/results/AnnotatedCSVResponseImpl.ts @@ -28,13 +28,13 @@ export class AnnotatedCSVResponseImpl implements AnnotatedCSVResponse { private chunkCombiner: ChunkCombiner ) {} lines(): Observable { - return new ObservableQuery(this.executor, observer => + return new ObservableQuery(this.executor, (observer) => chunksToLines(observer, this.chunkCombiner) ) } rows(): Observable { - return new ObservableQuery(this.executor, observer => { + return new ObservableQuery(this.executor, (observer) => { return chunksToLines( linesToTables({ next(values, tableMeta) { diff --git a/packages/core/src/results/ObservableQuery.ts b/packages/core/src/results/ObservableQuery.ts index 676f16456..b76f02896 100644 --- a/packages/core/src/results/ObservableQuery.ts +++ b/packages/core/src/results/ObservableQuery.ts @@ -22,10 +22,10 @@ class QuerySubscription implements Subscription { public constructor(observer: Observer, executor: APIExecutor) { try { executor({ - next: value => { + next: (value) => { observer.next(value) }, - error: e => { + error: (e) => { this.isClosed = true observer.error(e) }, @@ -33,7 +33,7 @@ class QuerySubscription implements Subscription { this.isClosed = true observer.complete() }, - useCancellable: c => { + useCancellable: (c) => { this.cancellable = c }, }) diff --git a/packages/core/src/util/escape.ts b/packages/core/src/util/escape.ts index a88949dd5..7823d0a43 100644 --- a/packages/core/src/util/escape.ts +++ b/packages/core/src/util/escape.ts @@ -2,7 +2,7 @@ function createEscaper( characters: string, replacements: string[] ): (value: string) => string { - return function(value: string): string { + return function (value: string): string { let retVal = '' let from = 0 let i = 0 diff --git a/packages/core/test/integration/rxjs/QueryApi.test.ts b/packages/core/test/integration/rxjs/QueryApi.test.ts index ae5749303..1de953670 100644 --- a/packages/core/test/integration/rxjs/QueryApi.test.ts +++ b/packages/core/test/integration/rxjs/QueryApi.test.ts @@ -93,14 +93,14 @@ describe('RxJS QueryApi integration', () => { const [tables, rows] = await firstValueFrom( from(subject.rows('from(bucket:"my-bucket") |> range(start: 0)')).pipe( groupBy(({tableMeta}) => tableMeta), - mergeMap(group => + mergeMap((group) => concat(of(group.key), group.pipe(map(({values}) => values))) ), map((data, index) => Array.isArray(data) ? {index, row: data} : {index, meta: data} ), - groupBy(value => 'meta' in value), - mergeMap(group => group.pipe(toArray())), + groupBy((value) => 'meta' in value), + mergeMap((group) => group.pipe(toArray())), toArray() ) ) diff --git a/packages/core/test/unit/Influxdb.test.ts b/packages/core/test/unit/Influxdb.test.ts index 7f7133726..3e568b6d6 100644 --- a/packages/core/test/unit/Influxdb.test.ts +++ b/packages/core/test/unit/Influxdb.test.ts @@ -19,10 +19,12 @@ describe('InfluxDB', () => { }) it('is created from configuration with url and token', () => { expect( - (new InfluxDB({ - url: 'https://localhost:8086?token=a', - token: 'b', - }) as any)._options + ( + new InfluxDB({ + url: 'https://localhost:8086?token=a', + token: 'b', + }) as any + )._options ).to.deep.equal({ url: 'https://localhost:8086?token=a', token: 'b', @@ -43,19 +45,19 @@ describe('InfluxDB', () => { }) }) it('fails on null arg', () => { - expect(() => new InfluxDB((null as unknown) as ClientOptions)).to.throw( + expect(() => new InfluxDB(null as unknown as ClientOptions)).to.throw( 'No url or configuration specified!' ) }) it('fails on undefined arg', () => { expect( - () => new InfluxDB((undefined as unknown) as ClientOptions) + () => new InfluxDB(undefined as unknown as ClientOptions) ).to.throw('No url or configuration specified!') }) it('fails on missing url', () => { - expect( - () => new InfluxDB(({} as ClientOptions) as ClientOptions) - ).to.throw('No url specified!') + expect(() => new InfluxDB({} as ClientOptions as ClientOptions)).to.throw( + 'No url specified!' + ) }) it('fails on unsupported protocol', () => { expect( @@ -72,16 +74,16 @@ describe('InfluxDB', () => { }) ).has.property('transport') expect( - new InfluxDB(({ + new InfluxDB({ url: 'http://localhost:8086', transport: null, - } as any) as ClientOptions) + } as any as ClientOptions) ).has.property('transport') expect( - new InfluxDB(({ + new InfluxDB({ url: 'http://localhost:8086', transport: {} as Transport, - } as any) as ClientOptions) + } as any as ClientOptions) ).has.property('transport') }) it('creates instance with follow-redirects', () => { diff --git a/packages/core/test/unit/Point.test.ts b/packages/core/test/unit/Point.test.ts index 8155b6306..f87ce0578 100644 --- a/packages/core/test/unit/Point.test.ts +++ b/packages/core/test/unit/Point.test.ts @@ -139,11 +139,11 @@ describe('Point', () => { expect(point.toLineProtocol()).equals('tst a=1 1') }) it("serializes Point's unknown timestamp as-is OOTB", () => { - const point = new Point('tst').floatField('a', 1).timestamp(({ + const point = new Point('tst').floatField('a', 1).timestamp({ toString() { return 'any' }, - } as unknown) as undefined) + } as unknown as undefined) expect(point.toLineProtocol()).equals('tst a=1 any') }) }) diff --git a/packages/core/test/unit/QueryApi.test.ts b/packages/core/test/unit/QueryApi.test.ts index 87e8aaf30..a0b4592b9 100644 --- a/packages/core/test/unit/QueryApi.test.ts +++ b/packages/core/test/unit/QueryApi.test.ts @@ -173,7 +173,7 @@ describe('QueryApi', () => { let authorization: any nock(clientOptions.url) .post(QUERY_PATH) - .reply(function(_uri, requestBody) { + .reply(function (_uri, requestBody) { body = requestBody authorization = this.req.headers.authorization return [200, '', {}] diff --git a/packages/core/test/unit/WriteApi.test.ts b/packages/core/test/unit/WriteApi.test.ts index dd93e6f3b..1f80934ba 100644 --- a/packages/core/test/unit/WriteApi.test.ts +++ b/packages/core/test/unit/WriteApi.test.ts @@ -82,8 +82,10 @@ describe('WriteApi', () => { collectLogging.after() }) it('can be closed and flushed without any data', async () => { - await subject.close().catch(e => expect.fail('should not happen', e)) - await subject.flush(true).catch(e => expect.fail('should not happen', e)) + await subject.close().catch((e) => expect.fail('should not happen', e)) + await subject + .flush(true) + .catch((e) => expect.fail('should not happen', e)) }) it('fails on close without server connection', async () => { subject.writeRecord('test value=1') @@ -91,7 +93,7 @@ describe('WriteApi', () => { await subject .close() .then(() => expect.fail('failure expected')) - .catch(e => { + .catch((e) => { expect(logs.error).length.greaterThan(0) expect(e).to.be.ok }) @@ -102,7 +104,7 @@ describe('WriteApi', () => { await subject .flush() .then(() => expect.fail('failure expected')) - .catch(e => { + .catch((e) => { expect([...logs.error, ...logs.warn]).to.length(1) expect(e).to.be.ok }) @@ -473,10 +475,7 @@ describe('WriteApi', () => { }) .persist() subject.writePoint( - new Point('test') - .tag('t', ' ') - .floatField('value', 1) - .timestamp('') + new Point('test').tag('t', ' ').floatField('value', 1).timestamp('') ) await waitForCondition(() => writeCounters.successLineCount == 1) expect(logs.error).has.length(0) @@ -491,7 +490,7 @@ describe('WriteApi', () => { new Point('test').floatField('value', 6).timestamp(new Date(3)), new Point('test') .floatField('value', 7) - .timestamp((false as any) as string), // server decides what to do with such values + .timestamp(false as any as string), // server decides what to do with such values ]) await waitForCondition(() => writeCounters.successLineCount == 7) expect(logs.error).to.length(0) @@ -531,7 +530,7 @@ describe('WriteApi', () => { const messages: string[] = [] nock(clientOptions.url) .post(WRITE_PATH_NS) - .reply(function(_uri, _requestBody) { + .reply(function (_uri, _requestBody) { requests++ if (requests % 2) { return [429, '', {'retry-after': '1'}] @@ -547,10 +546,7 @@ describe('WriteApi', () => { }) .persist() subject.writePoint( - new Point('test') - .tag('t', ' ') - .floatField('value', 1) - .timestamp('') + new Point('test').tag('t', ' ').floatField('value', 1).timestamp('') ) await waitForCondition(() => writeCounters.successLineCount == 1) expect(logs.error).has.length(0) @@ -565,7 +561,7 @@ describe('WriteApi', () => { new Point('test').floatField('value', 6).timestamp(new Date(3)), new Point('test') .floatField('value', 7) - .timestamp((false as any) as string), // server decides what to do with such values + .timestamp(false as any as string), // server decides what to do with such values ]) await waitForCondition(() => writeCounters.successLineCount == 7) expect(logs.error).to.length(0) @@ -604,7 +600,7 @@ describe('WriteApi', () => { let authorization: any nock(clientOptions.url) .post(WRITE_PATH_NS) - .reply(function(_uri, _requestBody) { + .reply(function (_uri, _requestBody) { authorization = this.req.headers.authorization return [200, '', {}] }) @@ -632,7 +628,7 @@ describe('WriteApi', () => { let authorization: any nock(clientOptions.url) .post(WRITE_PATH_NS) - .reply(function(_uri, _requestBody) { + .reply(function (_uri, _requestBody) { authorization = this.req.headers.authorization return [204, '', {}] }) @@ -650,7 +646,7 @@ describe('WriteApi', () => { let uri: any nock(clientOptions.url) .post(/.*/) - .reply(function(_uri, _requestBody) { + .reply(function (_uri, _requestBody) { uri = this.req.path return [204, '', {}] }) @@ -669,7 +665,7 @@ describe('WriteApi', () => { let uri: any nock(clientOptions.url) .post(/.*/) - .reply(function(_uri, _requestBody) { + .reply(function (_uri, _requestBody) { uri = this.req.path return [204, '', {}] }) @@ -686,7 +682,7 @@ describe('WriteApi', () => { }) nock(clientOptions.url) .post(/.*/) - .reply(function(_uri, _requestBody) { + .reply(function (_uri, _requestBody) { return [ 500, '{"error": "write: hinted handoff queue not empty"}', diff --git a/packages/core/test/unit/errors.test.ts b/packages/core/test/unit/errors.test.ts index 44a7fa9ed..2f7aa99a8 100644 --- a/packages/core/test/unit/errors.test.ts +++ b/packages/core/test/unit/errors.test.ts @@ -50,7 +50,7 @@ describe('errors', () => { return err })(), ] - testSetOK.forEach(error => { + testSetOK.forEach((error) => { it('retries ' + error, () => { expect(canRetryHttpCall(error)).to.be.true if (error instanceof HttpError) { @@ -66,7 +66,7 @@ describe('errors', () => { new IllegalArgumentError('illegal argument'), new Error(''), ] - testSetNotOK.forEach(error => { + testSetNotOK.forEach((error) => { it('does not retry ' + error, () => { expect(canRetryHttpCall(error)).to.be.false }) @@ -81,7 +81,7 @@ describe('errors', () => { {error: new RequestTimedOutError(), retryAfter: 0}, {error: new AbortError(), retryAfter: 0}, ] - testSet.forEach(entry => { + testSet.forEach((entry) => { it(`retries ${entry.error} in ${entry.retryAfter} ms`, () => { expect((entry.error as RetriableDecision).retryAfter()).to.be.equal( entry.retryAfter @@ -96,7 +96,7 @@ describe('errors', () => { new IllegalArgumentError('illegal argument'), new Error(''), ] - testSetNotOK.forEach(error => { + testSetNotOK.forEach((error) => { it('does not retry ' + error, () => { expect(canRetryHttpCall(error)).to.be.false }) @@ -115,7 +115,7 @@ describe('errors', () => { {error: null, retryAfter: 0}, {error: undefined, retryAfter: 0}, ] - testSet.forEach(entry => { + testSet.forEach((entry) => { it(`retries ${entry.error} in ${ entry.retryAfter === -1 ? '>=1' : entry.retryAfter } ms`, () => { diff --git a/packages/core/test/unit/impl/ObservableQuery.test.ts b/packages/core/test/unit/impl/ObservableQuery.test.ts index d51c75ba9..4abf7ca66 100644 --- a/packages/core/test/unit/impl/ObservableQuery.test.ts +++ b/packages/core/test/unit/impl/ObservableQuery.test.ts @@ -21,12 +21,11 @@ const encoder = new TextEncoder() describe('ObservableQuery', () => { it('sequence complete', async () => { - let source: CommunicationObserver = completeCommunicationObserver( - {} - ) // source is assigned by subject.subscribe + let source: CommunicationObserver = + completeCommunicationObserver({}) // source is assigned by subject.subscribe const subject = new ObservableQuery( - consumer => (source = consumer), - x => chunksToLines(x) + (consumer) => (source = consumer), + (x) => chunksToLines(x) ) const subscriber = new TestSubscriber() const subscription = subject.subscribe(subscriber) @@ -38,12 +37,11 @@ describe('ObservableQuery', () => { expect(['next', 'next', 'complete']).deep.equals(subscriber.results) }) it('sequence error', async () => { - let source: CommunicationObserver = completeCommunicationObserver( - {} - ) + let source: CommunicationObserver = + completeCommunicationObserver({}) const subject = new ObservableQuery( - consumer => (source = consumer), - x => chunksToLines(x) + (consumer) => (source = consumer), + (x) => chunksToLines(x) ) const subscriber = new TestSubscriber() const subscription = subject.subscribe(subscriber) @@ -55,12 +53,11 @@ describe('ObservableQuery', () => { expect(['next', 'next', 'error']).deep.equals(subscriber.results) }) it('unsubscribed', async () => { - let source: CommunicationObserver = completeCommunicationObserver( - {} - ) + let source: CommunicationObserver = + completeCommunicationObserver({}) const subject = new ObservableQuery( - consumer => (source = consumer), - x => chunksToLines(x) + (consumer) => (source = consumer), + (x) => chunksToLines(x) ) const subscriber = new TestSubscriber() const subscription = subject.subscribe(subscriber) @@ -75,7 +72,7 @@ describe('ObservableQuery', () => { () => { throw new Error() }, - x => chunksToLines(x) + (x) => chunksToLines(x) ) const subscriber = new TestSubscriber() const subscription = subject.subscribe(subscriber) @@ -83,25 +80,24 @@ describe('ObservableQuery', () => { expect(['error']).deep.equals(subscriber.results) }) it('subscriber methods are optional', async () => { - let source: CommunicationObserver = completeCommunicationObserver( - {} - ) // source is assigned by subject.subscribe + let source: CommunicationObserver = + completeCommunicationObserver({}) // source is assigned by subject.subscribe const subject = new ObservableQuery( - consumer => (source = consumer), - x => chunksToLines(x) + (consumer) => (source = consumer), + (x) => chunksToLines(x) ) const s1 = subject.subscribe({}) source.next(encoder.encode('next\n')) source.complete() expect(s1.closed).equals(true) - const s2 = subject.subscribe((null as any) as Observer) + const s2 = subject.subscribe(null as any as Observer) source.next(encoder.encode('next\n')) source.error(new Error()) expect(s2.closed).equals(true) let called = false - const s3 = subject.subscribe(_ => (called = true)) + const s3 = subject.subscribe((_) => (called = true)) source.next(encoder.encode('next\n')) source.complete() expect(called).equals(true) diff --git a/packages/core/test/unit/impl/browser/FetchTransport.test.ts b/packages/core/test/unit/impl/browser/FetchTransport.test.ts index 030c6ddbb..d8ea33b68 100644 --- a/packages/core/test/unit/impl/browser/FetchTransport.test.ts +++ b/packages/core/test/unit/impl/browser/FetchTransport.test.ts @@ -100,7 +100,7 @@ describe('FetchTransport', () => { headers: {'content-type': 'text/plain'}, body: '{}', }, - opts => { + (opts) => { options = opts } ) @@ -117,7 +117,7 @@ describe('FetchTransport', () => { headers: {'content-type': 'text/plain'}, body: '{}', }, - req => (lastRequest = req) + (req) => (lastRequest = req) ) const transport = new FetchTransport({url: 'http://test:8086'}) transport.requestDecorator = (request): void => { @@ -126,9 +126,7 @@ describe('FetchTransport', () => { await transport.request('/whatever', '', { method: 'POST', }) - expect(lastRequest) - .property('body') - .equals('modified') + expect(lastRequest).property('body').equals('modified') }) it('receives also response headers', async () => { emulateFetchApi({ @@ -142,7 +140,7 @@ describe('FetchTransport', () => { { method: 'POST', }, - function(headers, status) { + function (headers, status) { responseMeta = [headers, status] } ) @@ -194,10 +192,7 @@ describe('FetchTransport', () => { }) .then( () => Promise.reject('client error expected'), - (e: any) => - expect(e) - .property('message') - .equals('error data') //thrown by emulator + (e: any) => expect(e).property('message').equals('error data') //thrown by emulator ) }) it('throws error', async () => { @@ -231,10 +226,7 @@ describe('FetchTransport', () => { }) .then( () => Promise.reject('client error expected'), - (e: any) => - expect(e) - .property('body') - .equals(message) + (e: any) => expect(e).property('body').equals(message) ) }) it('throws error with empty body', async () => { @@ -249,10 +241,7 @@ describe('FetchTransport', () => { }) .then( () => Promise.reject('client error expected'), - (e: any) => - expect(e) - .property('body') - .equals('') + (e: any) => expect(e).property('body').equals('') ) }) it('throws error with json body', async () => { @@ -269,18 +258,10 @@ describe('FetchTransport', () => { .then( () => Promise.reject('client error expected'), (e: any) => { - expect(e) - .property('body') - .equals(body) - expect(e) - .property('json') - .deep.equals(JSON.parse(body)) - expect(e) - .property('message') - .equals('mymsg') - expect(e) - .property('code') - .equals('mycode') + expect(e).property('body').equals(body) + expect(e).property('json').deep.equals(JSON.parse(body)) + expect(e).property('message').equals('mymsg') + expect(e).property('code').equals('mycode') } ) }) @@ -291,7 +272,7 @@ describe('FetchTransport', () => { headers: {'content-type': 'text/plain'}, body: '{}', }, - req => (request = req) + (req) => (request = req) ) await transport.request('/whatever', '', { method: 'GET', @@ -506,9 +487,9 @@ describe('FetchTransport', () => { headers: {'content-type': 'text/plain'}, body: '{}', }, - req => (request = req) + (req) => (request = req) ) - await new Promise(resolve => + await new Promise((resolve) => transport.send( 'http://test:8086', '', @@ -521,7 +502,7 @@ describe('FetchTransport', () => { ) ) expect(request?.credentials).is.deep.equal('omit') - await new Promise(resolve => + await new Promise((resolve) => new FetchTransport({ url: 'http://test:8086', transportOptions: {credentials: 'my-val'}, diff --git a/packages/core/test/unit/impl/browser/emulateBrowser.ts b/packages/core/test/unit/impl/browser/emulateBrowser.ts index f190349b4..490a2ae17 100644 --- a/packages/core/test/unit/impl/browser/emulateBrowser.ts +++ b/packages/core/test/unit/impl/browser/emulateBrowser.ts @@ -29,7 +29,7 @@ function createResponse({ json(): Promise { if (typeof body === 'string') { if (body === 'error') return Promise.reject(new Error('error data')) - return Promise.resolve(body).then(body => + return Promise.resolve(body).then((body) => body ? JSON.parse(body) : '' ) } else { @@ -38,13 +38,13 @@ function createResponse({ }, } if (typeof body === 'string') { - retVal.text = function(): Promise { + retVal.text = function (): Promise { if (body === 'error') return Promise.reject(new Error('error data')) return Promise.resolve(body) } } if (body instanceof Uint8Array) { - retVal.arrayBuffer = function(): Promise { + retVal.arrayBuffer = function (): Promise { return Promise.resolve( body.buffer.slice(body.byteOffset, body.byteOffset + body.length) ) diff --git a/packages/core/test/unit/impl/node/NodeHttpTransport.test.ts b/packages/core/test/unit/impl/node/NodeHttpTransport.test.ts index dadc6a28c..96abfdaa6 100644 --- a/packages/core/test/unit/impl/node/NodeHttpTransport.test.ts +++ b/packages/core/test/unit/impl/node/NodeHttpTransport.test.ts @@ -243,7 +243,7 @@ describe('NodeHttpTransport', () => { expect(responseStartedFn.callCount).equals(0) } }, - e => { + (e) => { expect.fail(undefined, e, e.toString()) } ) @@ -256,9 +256,7 @@ describe('NodeHttpTransport', () => { timeout: 100, } it(`fails silently on server error`, async () => { - nock(transportOptions.url) - .get('/test') - .reply(500, 'not ok') + nock(transportOptions.url).get('/test').reply(500, 'not ok') expect( new NodeHttpTransport(transportOptions).send('/test', '', { method: 'GET', @@ -266,17 +264,13 @@ describe('NodeHttpTransport', () => { ).to.not.throw }) it(`fails on server error`, async () => { - nock(transportOptions.url) - .get('/test') - .reply(500, 'not ok') + nock(transportOptions.url).get('/test').reply(500, 'not ok') await sendTestData(transportOptions, {method: 'GET'}) .then(() => { expect.fail('must not succeed') }) - .catch(e => { - expect(e) - .property('statusCode') - .to.equal(500) + .catch((e) => { + expect(e).property('statusCode').to.equal(500) }) }) it(`fails on decoding error`, async () => { @@ -300,10 +294,8 @@ describe('NodeHttpTransport', () => { .then(() => { expect.fail('must not succeed') }) - .catch(e => { - expect(e) - .property('message') - .is.not.equal('must not succeed') + .catch((e) => { + expect(e).property('message').is.not.equal('must not succeed') expect(e.toString()).does.not.include('time') // not timeout }) }) @@ -316,7 +308,7 @@ describe('NodeHttpTransport', () => { .then(() => { throw new Error('must not succeed') }) - .catch(e => { + .catch((e) => { expect(e.toString()).to.include('timed') }) }) @@ -329,37 +321,30 @@ describe('NodeHttpTransport', () => { .then(() => { throw new Error('must not succeed') }) - .catch(e => { + .catch((e) => { expect(e.toString()).to.include('timed') }) }) it(`fails on response timeout`, async () => { - nock(transportOptions.url) - .get('/test') - .delay(2000) - .reply(200, 'ok') + nock(transportOptions.url).get('/test').delay(2000).reply(200, 'ok') await sendTestData({...transportOptions, timeout: 100}, {method: 'GET'}) .then(() => { throw new Error('must not succeed') }) - .catch(e => { + .catch((e) => { expect(e.toString()).to.include('timed') }) }) it(`truncates error messages`, async () => { let bigMessage = 'this is a big error message' while (bigMessage.length < 1001) bigMessage += bigMessage - nock(transportOptions.url) - .get('/test') - .reply(500, bigMessage) + nock(transportOptions.url).get('/test').reply(500, bigMessage) await sendTestData(transportOptions, {method: 'GET'}) .then(() => { throw new Error('must not succeed') }) .catch((e: any) => { - expect(e) - .property('body') - .to.length(1000) + expect(e).property('body').to.length(1000) }) }) it(`parses error responses`, async () => { @@ -374,18 +359,10 @@ describe('NodeHttpTransport', () => { throw new Error('must not succeed') }, (e: any) => { - expect(e) - .property('body') - .to.length(bigMessage.length) - expect(e) - .property('json') - .deep.equals(JSON.parse(bigMessage)) - expect(e) - .property('code') - .equals('mc') - expect(e) - .property('message') - .equals('mymsg') + expect(e).property('body').to.length(bigMessage.length) + expect(e).property('json').deep.equals(JSON.parse(bigMessage)) + expect(e).property('code').equals('mc') + expect(e).property('message').equals('mymsg') } ) }) @@ -399,9 +376,7 @@ describe('NodeHttpTransport', () => { throw new Error('must not succeed') }) .catch((e: any) => { - expect(e) - .property('body') - .equals(errorMessage) + expect(e).property('body').equals(errorMessage) }) }) it(`is aborted before the whole response arrives`, async () => { @@ -429,13 +404,11 @@ describe('NodeHttpTransport', () => { ]) .persist() await sendTestData(transportOptions, {method: 'GET'}) - .then(_data => { + .then((_data) => { expect.fail('not expected!') }) .catch((e: any) => { - expect(e) - .property('message') - .to.include('aborted') + expect(e).property('message').to.include('aborted') }) }) it(`signalizes error upon request's error'`, async () => { @@ -463,13 +436,11 @@ describe('NodeHttpTransport', () => { ]) .persist() await sendTestData(transportOptions, {method: 'GET'}) - .then(_data => { + .then((_data) => { expect.fail('not expected!') }) .catch((e: any) => { - expect(e) - .property('message') - .to.include('request failed') + expect(e).property('message').to.include('request failed') }) }) }) @@ -487,12 +458,12 @@ describe('NodeHttpTransport', () => { await sendTestData( {...transportOptions, timeout: 1000}, {method: 'GET'}, - cancellable => cancellable.cancel() + (cancellable) => cancellable.cancel() ) - .then(data => { + .then((data) => { expect(data).to.equal('') }) - .catch(e => { + .catch((e) => { throw e }) }) @@ -518,12 +489,12 @@ describe('NodeHttpTransport', () => { await sendTestData( {...transportOptions, timeout: 10000}, {method: 'GET'}, - toSet => (cancellable = toSet) + (toSet) => (cancellable = toSet) ) - .then(data => { + .then((data) => { expect(data).to.equal('') }) - .catch(e => { + .catch((e) => { throw e }) }) @@ -542,12 +513,14 @@ describe('NodeHttpTransport', () => { url: TEST_URL, timeout: 100, } - ;([ - [null, ''], - ['', ''], - ['a', 'a'], - [{yes: true}, '{"yes":true}'], - ] as Array>).forEach((pair, i) => { + ;( + [ + [null, ''], + ['', ''], + ['a', 'a'], + [{yes: true}, '{"yes":true}'], + ] as Array> + ).forEach((pair, i) => { it(`returns string response ${i}`, async () => { let remainingChunks = 2 let body: any = undefined @@ -580,11 +553,13 @@ describe('NodeHttpTransport', () => { expect(body).equals(pair[1]) }) }) - ;([ - [{yes: true}, {yes: true}, 'application/json'], - // eslint-disable-next-line no-undef - ['abcd', Buffer.from('abcd'), 'application/binary'], - ] as Array>).forEach(pair => { + ;( + [ + [{yes: true}, {yes: true}, 'application/json'], + // eslint-disable-next-line no-undef + ['abcd', Buffer.from('abcd'), 'application/binary'], + ] as Array> + ).forEach((pair) => { it(`returns ${pair[2]} response`, async () => { nock(transportOptions.url) .get('/test') @@ -779,7 +754,7 @@ describe('NodeHttpTransport', () => { .get('/test') .reply( 200, - function(_uri, _body, callback) { + function (_uri, _body, callback) { extra = this.req.headers['extra'] callback(null, '..') }, @@ -808,7 +783,7 @@ describe('NodeHttpTransport', () => { .get(/.*/) .reply( 200, - function(uri, _body, callback) { + function (uri, _body, callback) { requestPath = uri headers = {...this.req.headers} callback(null, '..') diff --git a/packages/core/test/unit/impl/retryStrategy.test.ts b/packages/core/test/unit/impl/retryStrategy.test.ts index 0719c8a2f..304fb1472 100644 --- a/packages/core/test/unit/impl/retryStrategy.test.ts +++ b/packages/core/test/unit/impl/retryStrategy.test.ts @@ -93,13 +93,8 @@ describe('RetryStrategyImpl', () => { return acc }, [] as number[]) // truncate values to ignore jittering - expect(values.map(x => Math.trunc(x / 100) * 100)).to.be.deep.equal([ - 100, - 500, - 2000, - 2000, - 2000, - 2000, + expect(values.map((x) => Math.trunc(x / 100) * 100)).to.be.deep.equal([ + 100, 500, 2000, 2000, 2000, 2000, ]) subject.success() expect(Math.trunc(subject.nextDelay() / 100) * 100).equals(100) diff --git a/packages/core/test/unit/query/flux.test.ts b/packages/core/test/unit/query/flux.test.ts index 2c5148784..01f362eb1 100644 --- a/packages/core/test/unit/query/flux.test.ts +++ b/packages/core/test/unit/query/flux.test.ts @@ -97,7 +97,7 @@ describe('Flux Values', () => { {value: /abc/, flux: 'regexp.compile(v: "/abc/")'}, { value: { - toString: function(): string { + toString: function (): string { return 'whatever' }, }, @@ -112,7 +112,7 @@ describe('Flux Values', () => { {value: ['a"$d'], flux: '["a\\"$d"]'}, {value: Symbol('thisSym'), flux: `"${Symbol('thisSym').toString()}"`}, ] - pairs.forEach(pair => { + pairs.forEach((pair) => { it(`converts ${JSON.stringify(String(pair.value))} to '${ pair.flux }'`, () => { @@ -162,7 +162,7 @@ describe('Flux Tagged Template', () => { }) it('fails on wrong usage of template', () => { try { - flux((['1', '2'] as any) as TemplateStringsArray) + flux(['1', '2'] as any as TemplateStringsArray) expect.fail() } catch (_e) { // ok expected, too few arguments supplied to a tagged template @@ -202,7 +202,7 @@ describe('Flux Tagged Template', () => { {value: flux`${/abc/}`, flux: 'regexp.compile(v: "/abc/")'}, { value: flux`${{ - toString: function(): string { + toString: function (): string { return 'whatever' }, }}`, @@ -220,7 +220,7 @@ describe('Flux Tagged Template', () => { flux: `"${Symbol('thisSym').toString()}"`, }, ] - pairs.forEach(pair => { + pairs.forEach((pair) => { expect(pair.value.toString()).equals(pair.flux) }) }) @@ -240,7 +240,7 @@ describe('Flux Tagged Template', () => { {value: flux`"${/abc/}"`, flux: `"${/abc/.toString()}"`}, { value: flux`"${{ - toString: function(): string { + toString: function (): string { return 'whatever' }, }}"`, @@ -258,7 +258,7 @@ describe('Flux Tagged Template', () => { flux: `"${Symbol('thisSym').toString()}"`, }, ] - pairs.forEach(pair => { + pairs.forEach((pair) => { expect(pair.value.toString()).equals(pair.flux) }) }) diff --git a/packages/core/test/unit/results/chunkCombiner.test.ts b/packages/core/test/unit/results/chunkCombiner.test.ts index 03a9a2998..88533c2d0 100644 --- a/packages/core/test/unit/results/chunkCombiner.test.ts +++ b/packages/core/test/unit/results/chunkCombiner.test.ts @@ -23,7 +23,7 @@ describe('createTextDecoderCombiner', () => { }) // see examples in https://en.wikipedia.org/wiki/UTF-8 const chunks = [ - ...[0, 1, 2, 3, 4, 5, 6, 7].map(num => [ + ...[0, 1, 2, 3, 4, 5, 6, 7].map((num) => [ String.fromCharCode(num << 4), Uint8Array.from([num << 4]), ]), diff --git a/packages/core/test/unit/results/chunksToLines.test.ts b/packages/core/test/unit/results/chunksToLines.test.ts index fb1fea0f8..e0e90bb2b 100644 --- a/packages/core/test/unit/results/chunksToLines.test.ts +++ b/packages/core/test/unit/results/chunksToLines.test.ts @@ -55,7 +55,7 @@ describe('chunksToLines', () => { const target = new CollectLinesObserver() const subject = chunksToLines(target, nodeChunkCombiner) subject.next(Buffer.from('abcd', 'utf8')) - subject.next((1 as any) as Uint8Array) + subject.next(1 as any as Uint8Array) expect(target.failed).to.be.equal(1) }) it('do not emit lines after being cancelled', () => { diff --git a/packages/core/test/unit/results/stringToLines.test.ts b/packages/core/test/unit/results/stringToLines.test.ts index cac9ee1a1..6d5b7407d 100644 --- a/packages/core/test/unit/results/stringToLines.test.ts +++ b/packages/core/test/unit/results/stringToLines.test.ts @@ -11,8 +11,8 @@ interface StringToLinesTest { describe('chunksToLines', () => { const tests = chunksToLinesTables - .filter(x => x.chunks.indexOf('error') === -1) - .map(x => ({...x, source: x.chunks.join('')})) + .filter((x) => x.chunks.indexOf('error') === -1) + .map((x) => ({...x, source: x.chunks.join('')})) tests.forEach((test: StringToLinesTest) => { it(test.name, () => { const target = new CollectLinesObserver() diff --git a/packages/core/test/unit/util/logger.test.ts b/packages/core/test/unit/util/logger.test.ts index 56609e886..e1ef97e0d 100644 --- a/packages/core/test/unit/util/logger.test.ts +++ b/packages/core/test/unit/util/logger.test.ts @@ -2,37 +2,39 @@ import {expect} from 'chai' import {Log, setLogger, consoleLogger} from '../../../src/util/logger' describe('Logger', () => { - ;[{message: ' hey', error: 'you'}, {message: ' hey'}].forEach(data => { - it(`uses custom logger's error (${Object.keys(data).length})`, () => { - let args: Array | undefined - setLogger({ - error(message, error): void { - // eslint-disable-next-line prefer-rest-params - args = Array.from(arguments) - consoleLogger.error(message, error) - }, - warn(message, error): void { - consoleLogger.warn(message, error) - }, - }) - Log.error.call(Log, data.message, data.error) - expect(args).to.be.deep.equal([data.message, data.error]) - }) - it(`uses custom logger's warn (${Object.keys(data).length})`, () => { - let args: Array | undefined - setLogger({ - error(message, error): void { - consoleLogger.error(message, error) - }, - warn(message, error): void { - // eslint-disable-next-line prefer-rest-params - args = Array.from(arguments) - consoleLogger.warn(message, error) - }, + ;[{message: ' hey', error: 'you'}, {message: ' hey'}].forEach( + (data) => { + it(`uses custom logger's error (${Object.keys(data).length})`, () => { + let args: Array | undefined + setLogger({ + error(message, error): void { + // eslint-disable-next-line prefer-rest-params + args = Array.from(arguments) + consoleLogger.error(message, error) + }, + warn(message, error): void { + consoleLogger.warn(message, error) + }, + }) + Log.error.call(Log, data.message, data.error) + expect(args).to.be.deep.equal([data.message, data.error]) }) + it(`uses custom logger's warn (${Object.keys(data).length})`, () => { + let args: Array | undefined + setLogger({ + error(message, error): void { + consoleLogger.error(message, error) + }, + warn(message, error): void { + // eslint-disable-next-line prefer-rest-params + args = Array.from(arguments) + consoleLogger.warn(message, error) + }, + }) - Log.warn.call(Log, data.message, data.error) - expect(args).to.be.deep.equal([data.message, data.error]) - }) - }) + Log.warn.call(Log, data.message, data.error) + expect(args).to.be.deep.equal([data.message, data.error]) + }) + } + ) }) diff --git a/packages/core/test/unit/util/waitForCondition.ts b/packages/core/test/unit/util/waitForCondition.ts index 510ee6ebe..6270d9b93 100644 --- a/packages/core/test/unit/util/waitForCondition.ts +++ b/packages/core/test/unit/util/waitForCondition.ts @@ -13,7 +13,7 @@ export async function waitForCondition( step = 5 ): Promise { for (;;) { - await new Promise(resolve => setTimeout(resolve, step)) + await new Promise((resolve) => setTimeout(resolve, step)) timeout -= step if (timeout <= 0) { break diff --git a/packages/core/test/util.ts b/packages/core/test/util.ts index a5739a8a4..3911f159e 100644 --- a/packages/core/test/util.ts +++ b/packages/core/test/util.ts @@ -14,10 +14,10 @@ export const collectLogging = { warn: [], } previous = setLogger({ - error: function(...args) { + error: function (...args) { retVal.error.push(args) }, - warn: function(...args) { + warn: function (...args) { retVal.warn.push(args) }, }) @@ -29,11 +29,11 @@ export const collectLogging = { warn: [], } const previous = setLogger({ - error: function(...args) { + error: function (...args) { ;(previous.error as any).apply(previous, args) retVal.error.push(args) }, - warn: function(...args) { + warn: function (...args) { ;(previous.warn as any).apply(previous, args) retVal.warn.push(args) }, diff --git a/packages/giraffe/.nycrc b/packages/giraffe/.nycrc index 68653416c..90c0e717e 100644 --- a/packages/giraffe/.nycrc +++ b/packages/giraffe/.nycrc @@ -1,21 +1,11 @@ { "cache": false, "check-coverage": false, - "extension": [ - ".ts" - ], - "include": [ - "src/**/*.ts" - ], - "exclude": [ - "src/index.ts" - ], + "extension": [".ts"], + "include": ["src/**/*.ts"], + "exclude": ["src/index.ts"], "sourceMap": true, - "reporter": [ - "html", - "text", - "text-summary" - ], + "reporter": ["html", "text", "text-summary"], "all": true, "instrument": true -} \ No newline at end of file +} diff --git a/packages/giraffe/src/csvToTable.ts b/packages/giraffe/src/csvToTable.ts index 9dc3b966c..d3cab9730 100644 --- a/packages/giraffe/src/csvToTable.ts +++ b/packages/giraffe/src/csvToTable.ts @@ -46,7 +46,7 @@ function createResult( let table = tableFactory(tableLength) const fluxGroupKeyUnion: string[] = [] const resultColumnNames = new Set() - Object.keys(columns).forEach(key => { + Object.keys(columns).forEach((key) => { const col = columns[key] if (!col.multipleTypes) { ;(col.data as any).length = tableLength // extend the array length, required (and tested) @@ -61,7 +61,7 @@ function createResult( fluxGroupKeyUnion.push(key) } if (computeResultColumnNames && col.name === 'result') { - col.data.forEach(x => resultColumnNames.add(x as string)) + col.data.forEach((x) => resultColumnNames.add(x as string)) } } }) @@ -270,9 +270,8 @@ export function createCollector( existingColumn = columns[columnKey] } else if (existingColumn.type !== type) { // move the existing key to a type-specific key - columns[ - `${existingColumn.name} (${existingColumn.type})` - ] = existingColumn + columns[`${existingColumn.name} (${existingColumn.type})`] = + existingColumn // create a multiType (virtual) column columns[metaCol.label] = { name: metaCol.label, @@ -340,9 +339,9 @@ export function csvToFromFluxResult( let result: FromFluxResult | undefined let error: Error | undefined = undefined const collector = createCollector( - r => (result = r), + (r) => (result = r), /* istanbul ignore next because error is never thrown */ - e => (error = e), + (e) => (error = e), tableFactory, { computeFluxGroupKeyUnion: true, diff --git a/packages/giraffe/src/queryTable.ts b/packages/giraffe/src/queryTable.ts index 943e44d6f..56c4bc111 100644 --- a/packages/giraffe/src/queryTable.ts +++ b/packages/giraffe/src/queryTable.ts @@ -22,7 +22,7 @@ export function queryToTable( query, createCollector(resolve, reject, tableFactory, tableOptions) ) - }).then(result => result.table) + }).then((result) => result.table) } /** diff --git a/packages/giraffe/test/unit/csvToTable.test.ts b/packages/giraffe/test/unit/csvToTable.test.ts index acfc757cb..308bbb940 100644 --- a/packages/giraffe/test/unit/csvToTable.test.ts +++ b/packages/giraffe/test/unit/csvToTable.test.ts @@ -34,24 +34,15 @@ describe('csvToTable', () => { ]) expect(table.getColumn('_start', 'time')).deep.equals([ - 1549064312524, - 1549064312524, - 1549064312524, - 1549064312524, + 1549064312524, 1549064312524, 1549064312524, 1549064312524, ]) expect(table.getColumn('_stop', 'time')).deep.equals([ - 1549064342524, - 1549064342524, - 1549064342524, - 1549064342524, + 1549064342524, 1549064342524, 1549064342524, 1549064342524, ]) expect(table.getColumn('_time', 'time')).deep.equals([ - 1549064313000, - 1549064323000, - 1549064313000, - 1549064323000, + 1549064313000, 1549064323000, 1549064313000, 1549064323000, ]) expect(table.getColumn('_value (number)', 'number')).deep.equals([ diff --git a/packages/giraffe/test/unit/queryTable.test.ts b/packages/giraffe/test/unit/queryTable.test.ts index dd8f62622..e411d44ca 100644 --- a/packages/giraffe/test/unit/queryTable.test.ts +++ b/packages/giraffe/test/unit/queryTable.test.ts @@ -36,9 +36,7 @@ describe('queryToTable', () => { ,result,table,_start,_stop,_time,_value,_field,_measurement,cpu,host ,,3,2019-02-01T23:38:32.524234Z,2019-02-01T23:39:02.524234Z,2019-02-01T23:38:43Z,fourty,usage_guest,cpu,cpu0,oox4k.local` - nock(url) - .post(/.*/) - .reply(200, CSV) + nock(url).post(/.*/).reply(200, CSV) const table = await queryToTable(queryApi, 'ignored', newTable) expect(table.getColumn('result', 'string')).deep.equals([ @@ -49,24 +47,15 @@ describe('queryToTable', () => { ]) expect(table.getColumn('_start', 'time')).deep.equals([ - 1549064312524, - 1549064312524, - 1549064312524, - 1549064312524, + 1549064312524, 1549064312524, 1549064312524, 1549064312524, ]) expect(table.getColumn('_stop', 'time')).deep.equals([ - 1549064342524, - 1549064342524, - 1549064342524, - 1549064342524, + 1549064342524, 1549064342524, 1549064342524, 1549064342524, ]) expect(table.getColumn('_time', 'time')).deep.equals([ - 1549064313000, - 1549064323000, - 1549064313000, - 1549064323000, + 1549064313000, 1549064323000, 1549064313000, 1549064323000, ]) expect(table.getColumn('_value (number)', 'number')).deep.equals([ @@ -126,9 +115,7 @@ describe('queryToTable', () => { ,,1,usage_guest,,true,,1970-01-01T00:00:00.002000Z ,,1,usage_guest,,,,` - nock(url) - .post(/.*/) - .reply(200, CSV) + nock(url).post(/.*/).reply(200, CSV) const actual = await queryToTable(queryApi, 'ignored', newTable) expect(actual.getColumn('result')).deep.equals(['_result', '_result']) @@ -147,9 +134,7 @@ describe('queryToTable', () => { ,,0,2019-02-01T23:38:32.524234Z,2019-02-01T23:39:02.524234Z,2019-02-01T23:38:33Z,10,usage_guest,cpu,cpu-total,oox4k.local ,,1,2019-02-01T23:38:32.524234Z,2019-02-01T23:39:02.524234Z,2019-02-01T23:38:43Z,,usage_guest,cpu,cpu-total,oox4k.local` - nock(url) - .post(/.*/) - .reply(200, CSV) + nock(url).post(/.*/).reply(200, CSV) const table = await queryToTable(queryApi, 'ignored', newTable) expect(table.getColumn('_value')).deep.equals([10, null]) @@ -176,9 +161,7 @@ there",5 there",5 ,,1,hi,6` - nock(url) - .post(/.*/) - .reply(200, CSV) + nock(url).post(/.*/).reply(200, CSV) const table = await queryToTable(queryApi, 'ignored', newTable) expect(table.getColumn('value')).deep.equals([5, 5, 6, 5, 5, 6]) @@ -200,9 +183,7 @@ there",5 #default, ,result ,1` - nock(url) - .post(/.*/) - .reply(200, CSV) + nock(url).post(/.*/).reply(200, CSV) const actual = await queryToTable(queryApi, 'ignored', newTable, { maxTableLength: length, }) @@ -223,9 +204,7 @@ there",5 ,1 ,2 ,3` - nock(url) - .post(/.*/) - .reply(200, CSV) + nock(url).post(/.*/).reply(200, CSV) const actual = await queryToTable(queryApi, 'ignored', newTable, { maxTableLength: length, }) @@ -241,9 +220,7 @@ there",5 ,1 ,2 ,3` - nock(url) - .post(/.*/) - .reply(200, CSV) + nock(url).post(/.*/).reply(200, CSV) const actual = await queryToTable(queryApi, 'ignored', newTable, { accept: (row: string[]) => row[0] === '2', maxTableLength: 2, @@ -259,9 +236,7 @@ there",5 ,1 ,2 ,3` - nock(url) - .post(/.*/) - .reply(200, CSV) + nock(url).post(/.*/).reply(200, CSV) const actual = await queryToTable(queryApi, 'ignored', newTable, { accept: [ (row: string[]): boolean => Number(row[0]) < 3, @@ -279,9 +254,7 @@ there",5 ,1 ,2 ,3` - nock(url) - .post(/.*/) - .reply(200, CSV) + nock(url).post(/.*/).reply(200, CSV) const actual = await queryToTable(queryApi, 'ignored', newTable, { maxTableLength: 1, accept: (row: string[]) => Number(row[0]) > 1, @@ -297,9 +270,7 @@ there",5 ,1 ,2 ,3` - nock(url) - .post(/.*/) - .reply(200, CSV) + nock(url).post(/.*/).reply(200, CSV) const actual = await queryToTable(queryApi, 'ignored', newTable, { columns: ['a'], }) @@ -307,17 +278,13 @@ there",5 expect(actual.getColumn('result')).is.null }) it(`handles server error`, async () => { - nock(url) - .post(/.*/) - .reply(500, 'not ok') + nock(url).post(/.*/).reply(500, 'not ok') await queryToTable(queryApi, 'ignored', newTable) .then(() => { expect.fail('must not succeed') }) - .catch(e => { - expect(e) - .property('statusCode') - .to.equal(500) + .catch((e) => { + expect(e).property('statusCode').to.equal(500) }) }) it(`handles client abort error with success`, async () => { @@ -379,9 +346,7 @@ describe('queryToFromFluxResult', () => { ,a,b,c,d ,1,2,3,4` - nock(url) - .post(/.*/) - .reply(200, CSV) + nock(url).post(/.*/).reply(200, CSV) const {fluxGroupKeyUnion} = await queryToFromFluxResult( queryApi, 'ignored',