diff --git a/packages/grpc-js/prettier.config.js b/packages/grpc-js/prettier.config.js new file mode 100644 index 00000000..92747c8c --- /dev/null +++ b/packages/grpc-js/prettier.config.js @@ -0,0 +1,5 @@ +module.exports = { + proseWrap: 'always', + singleQuote: true, + trailingComma: 'es5', +}; diff --git a/packages/grpc-js/src/load-balancer-round-robin.ts b/packages/grpc-js/src/load-balancer-round-robin.ts index 72af705d..9faf872f 100644 --- a/packages/grpc-js/src/load-balancer-round-robin.ts +++ b/packages/grpc-js/src/load-balancer-round-robin.ts @@ -107,7 +107,7 @@ export class RoundRobinLoadBalancer implements LoadBalancer { private calculateAndUpdateState() { if (this.subchannelStateCounts[ConnectivityState.READY] > 0) { const readySubchannels = this.subchannels.filter(subchannel => subchannel.getConnectivityState() === ConnectivityState.READY); - let index: number = 0; + let index = 0; if (this.currentReadyPicker !== null) { index = readySubchannels.indexOf(this.currentReadyPicker.peekNextSubchannel()); if (index < 0) { diff --git a/packages/grpc-js/src/make-client.ts b/packages/grpc-js/src/make-client.ts index fc44c674..5e9d6711 100644 --- a/packages/grpc-js/src/make-client.ts +++ b/packages/grpc-js/src/make-client.ts @@ -39,6 +39,7 @@ export interface MethodDefinition { } export interface ServiceDefinition { + // tslint:disable-next-line no-any [index: string]: MethodDefinition; } diff --git a/packages/grpc-js/src/subchannel.ts b/packages/grpc-js/src/subchannel.ts index a52c3477..3ca2aa3f 100644 --- a/packages/grpc-js/src/subchannel.ts +++ b/packages/grpc-js/src/subchannel.ts @@ -100,7 +100,7 @@ export class Subchannel { * socket disconnects. Used for ending active calls with an UNAVAILABLE * status. */ - private disconnectListeners: (() => void)[] = []; + private disconnectListeners: Array<() => void> = []; private backoffTimeout: BackoffTimeout; diff --git a/packages/grpc-js/test/test-resolver.ts b/packages/grpc-js/test/test-resolver.ts index 790cd459..aca2152c 100644 --- a/packages/grpc-js/test/test-resolver.ts +++ b/packages/grpc-js/test/test-resolver.ts @@ -22,14 +22,14 @@ import * as resolverManager from '../src/resolver'; import { ServiceConfig } from '../src/service-config'; import { StatusObject } from '../src/call-stream'; -describe('Name Resolver', function() { +describe('Name Resolver', () => { describe('DNS Names', function() { // For some reason DNS queries sometimes take a long time on Windows this.timeout(4000); - before(function() { + before(() => { resolverManager.registerAll(); }); - it('Should resolve localhost properly', function(done) { + it('Should resolve localhost properly', (done) => { const target = 'localhost:50051'; const listener: resolverManager.ResolverListener = { onSuccessfulResolution: ( @@ -48,7 +48,7 @@ describe('Name Resolver', function() { const resolver = resolverManager.createResolver(target, listener); resolver.updateResolution(); }); - it('Should default to port 443', function(done) { + it('Should default to port 443', (done) => { const target = 'localhost'; const listener: resolverManager.ResolverListener = { onSuccessfulResolution: ( @@ -67,7 +67,7 @@ describe('Name Resolver', function() { const resolver = resolverManager.createResolver(target, listener); resolver.updateResolution(); }); - it('Should resolve a public address', function(done) { + it('Should resolve a public address', (done) => { const target = 'example.com'; const listener: resolverManager.ResolverListener = { onSuccessfulResolution: ( @@ -85,7 +85,7 @@ describe('Name Resolver', function() { const resolver = resolverManager.createResolver(target, listener); resolver.updateResolution(); }); - it('Should resolve a name with multiple dots', function(done) { + it('Should resolve a name with multiple dots', (done) => { const target = 'loopback4.unittest.grpc.io'; const listener: resolverManager.ResolverListener = { onSuccessfulResolution: ( @@ -103,7 +103,7 @@ describe('Name Resolver', function() { const resolver = resolverManager.createResolver(target, listener); resolver.updateResolution(); }); - it('Should resolve a name with a hyphen', function(done) { + it('Should resolve a name with a hyphen', (done) => { /* TODO(murgatroid99): Find or create a better domain name to test this with. * This is just the first one I found with a hyphen. */ const target = 'network-tools.com'; @@ -123,7 +123,7 @@ describe('Name Resolver', function() { const resolver = resolverManager.createResolver(target, listener); resolver.updateResolution(); }); - it('Should resolve gRPC interop servers', function(done) { + it('Should resolve gRPC interop servers', (done) => { let completeCount = 0; function done2(error?: Error) { if (error) { @@ -156,7 +156,7 @@ describe('Name Resolver', function() { resolver2.updateResolution(); }) }); - describe('UDS Names', function() { + describe('UDS Names', () => { it('Should handle a relative Unix Domain Socket name', done => { const target = 'unix:socket'; const listener: resolverManager.ResolverListener = { diff --git a/packages/grpc-js/tsconfig.json b/packages/grpc-js/tsconfig.json index e47c5eea..f60cbdc0 100644 --- a/packages/grpc-js/tsconfig.json +++ b/packages/grpc-js/tsconfig.json @@ -2,19 +2,13 @@ "extends": "./node_modules/gts/tsconfig-google.json", "compilerOptions": { "lib": ["es2017"], - "rootDir": ".", "outDir": "build", "target": "es2017", "module": "commonjs", "incremental": true }, "include": [ - "src/*.ts", "src/**/*.ts", - "test/*.ts", "test/**/*.ts" - ], - "exclude": [ - "node_modules" ] } diff --git a/packages/grpc-js/tslint.json b/packages/grpc-js/tslint.json new file mode 100644 index 00000000..27872a13 --- /dev/null +++ b/packages/grpc-js/tslint.json @@ -0,0 +1,8 @@ +{ + "extends": "gts/tslint.json", + "linterOptions": { + "exclude": [ + "**/*.json" + ] + } +}