lint pg-protcol

Author: brianc

.eslintrc

@@ -2,14 +2,15 @@
   "plugins": [
     "prettier"
   ],
+  "parser": "@typescript-eslint/parser",
   "extends": [
-    "plugin:prettier/recommended"
+    "plugin:prettier/recommended",
+    "prettier/@typescript-eslint"
   ],
   "ignorePatterns": [
-    "**/*.ts",
     "node_modules",
     "packages/pg",
-    "packages/pg-protocol",
+    "packages/pg-protocol/dist/**/*",
     "packages/pg-pool"
   ],
   "parserOptions": {

package.json

@@ -13,10 +13,11 @@
     "test": "yarn lerna exec yarn test",
     "build": "yarn lerna exec --scope pg-protocol yarn build",
     "pretest": "yarn build",
-    "lint": "yarn lerna exec --parallel yarn lint"
+    "lint": "eslint '*/**/*.{js,ts,tsx}'"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^2.27.0",
+    "@typescript-eslint/parser": "^2.27.0",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.10.1",
     "eslint-plugin-node": "^11.1.0",

packages/pg-protocol/src/b.ts

@@ -1,28 +1,28 @@
-// file for microbenchmarking 
+// file for microbenchmarking
 
-import { Writer } from './buffer-writer'
-import { serialize } from './index'
-import { BufferReader } from './buffer-reader'
+import { Writer } from './buffer-writer';
+import { serialize } from './index';
+import { BufferReader } from './buffer-reader';
 
-const LOOPS = 1000
-let count = 0
-let start = Date.now()
-const writer = new Writer()
+const LOOPS = 1000;
+let count = 0;
+let start = Date.now();
+const writer = new Writer();
 
-const reader = new BufferReader()
-const buffer = Buffer.from([33, 33, 33, 33, 33, 33, 33, 0])
+const reader = new BufferReader();
+const buffer = Buffer.from([33, 33, 33, 33, 33, 33, 33, 0]);
 
 const run = () => {
   if (count > LOOPS) {
-    console.log(Date.now() - start)
+    console.log(Date.now() - start);
     return;
   }
-  count++
-  for(let i = 0; i < LOOPS; i++) {
-    reader.setBuffer(0, buffer)
-    reader.cstring()
+  count++;
+  for (let i = 0; i < LOOPS; i++) {
+    reader.setBuffer(0, buffer);
+    reader.cstring();
   }
-  setImmediate(run)
-}
+  setImmediate(run);
+};
 
-run()
+run();

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

@@ -6,8 +6,7 @@ export class BufferReader {
   // TODO(bmc): support non-utf8 encoding?
   private encoding: string = 'utf-8';
 
-  constructor(private offset: number = 0) {
-  }
+  constructor(private offset: number = 0) {}
 
   public setBuffer(offset: number, buffer: Buffer): void {
     this.offset = offset;
@@ -40,8 +39,8 @@ export class BufferReader {
 
   public cstring(): string {
     const start = this.offset;
-    let end = start
-    while(this.buffer[end++] !== 0) { };
+    let end = start;
+    while (this.buffer[end++] !== 0) {}
     this.offset = end;
     return this.buffer.toString(this.encoding, start, end - 1);
   }

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

@@ -5,7 +5,7 @@ export class Writer {
   private offset: number = 5;
   private headerPosition: number = 0;
   constructor(private size = 256) {
-    this.buffer = Buffer.alloc(size)
+    this.buffer = Buffer.alloc(size);
   }
 
   private ensure(size: number): void {
@@ -22,36 +22,35 @@ export class Writer {
 
   public addInt32(num: number): Writer {
     this.ensure(4);
-    this.buffer[this.offset++] = (num >>> 24 & 0xFF);
-    this.buffer[this.offset++] = (num >>> 16 & 0xFF);
-    this.buffer[this.offset++] = (num >>> 8 & 0xFF);
-    this.buffer[this.offset++] = (num >>> 0 & 0xFF);
+    this.buffer[this.offset++] = (num >>> 24) & 0xff;
+    this.buffer[this.offset++] = (num >>> 16) & 0xff;
+    this.buffer[this.offset++] = (num >>> 8) & 0xff;
+    this.buffer[this.offset++] = (num >>> 0) & 0xff;
     return this;
   }
 
   public addInt16(num: number): Writer {
     this.ensure(2);
-    this.buffer[this.offset++] = (num >>> 8 & 0xFF);
-    this.buffer[this.offset++] = (num >>> 0 & 0xFF);
+    this.buffer[this.offset++] = (num >>> 8) & 0xff;
+    this.buffer[this.offset++] = (num >>> 0) & 0xff;
     return this;
   }
 
-
   public addCString(string: string): Writer {
     if (!string) {
       this.ensure(1);
     } else {
       var len = Buffer.byteLength(string);
       this.ensure(len + 1); // +1 for null terminator
-      this.buffer.write(string, this.offset, 'utf-8')
+      this.buffer.write(string, this.offset, 'utf-8');
       this.offset += len;
     }
 
     this.buffer[this.offset++] = 0; // null terminator
     return this;
   }
 
-  public addString(string: string = ""): Writer {
+  public addString(string: string = ''): Writer {
     var len = Buffer.byteLength(string);
     this.ensure(len);
     this.buffer.write(string, this.offset);
@@ -70,8 +69,8 @@ export class Writer {
     if (code) {
       this.buffer[this.headerPosition] = code;
       //length is everything in this packet minus the code
-      const length = this.offset - (this.headerPosition + 1)
-      this.buffer.writeInt32BE(length, this.headerPosition + 1)
+      const length = this.offset - (this.headerPosition + 1);
+      this.buffer.writeInt32BE(length, this.headerPosition + 1);
     }
     return this.buffer.slice(code ? 0 : 5, this.offset);
   }
@@ -80,8 +79,7 @@ export class Writer {
     var result = this.join(code);
     this.offset = 5;
     this.headerPosition = 0;
-    this.buffer = Buffer.allocUnsafe(this.size)
+    this.buffer = Buffer.allocUnsafe(this.size);
     return result;
   }
 }
-