Merge pull request brianc#2161 from brianc/bmc/lint

Prettier the codebase

Author: brianc

.eslintrc

@@ -1,14 +1,15 @@
 {
   "plugins": [
-    "node"
+    "prettier"
   ],
+  "parser": "@typescript-eslint/parser",
   "extends": [
-    "standard",
-    "eslint:recommended",
-    "plugin:node/recommended"
+    "plugin:prettier/recommended",
+    "prettier/@typescript-eslint"
   ],
   "ignorePatterns": [
-    "**/*.ts"
+    "node_modules",
+    "packages/pg-protocol/dist/**/*"
   ],
   "parserOptions": {
     "ecmaVersion": 2017,
@@ -18,17 +19,5 @@
     "node": true,
     "es6": true,
     "mocha": true
-  },
-  "rules": {
-    "space-before-function-paren": "off",
-    "node/no-unsupported-features/es-syntax": "off",
-    "node/no-unpublished-require": [
-      "error",
-      {
-        "allowModules": [
-          "pg"
-        ]
-      }
-    ]
   }
 }

package.json

@@ -10,13 +10,28 @@
     "packages/*"
   ],
   "scripts": {
-    "test": "yarn lerna exec yarn test",
+    "test": "yarn lint && 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": "!([[ -e node_modules/.bin/prettier ]]) || 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",
+    "eslint-plugin-prettier": "^3.1.2",
     "lerna": "^3.19.0"
   },
-  "dependencies": {}
+  "optionalDependencies": {
+    "prettier": "2.0.4"
+  },
+  "prettier": {
+    "semi": false,
+    "printWidth": 120,
+    "arrowParens": "always",
+    "trailingComma": "es5",
+    "singleQuote": true
+  }
 }

packages/pg-cursor/index.js

@@ -44,23 +44,23 @@ Cursor.prototype.submit = function (connection) {
 
   con.parse(
     {
-      text: this.text
+      text: this.text,
     },
     true
   )
 
   con.bind(
     {
       portal: this._portal,
-      values: this.values
+      values: this.values,
     },
     true
   )
 
   con.describe(
     {
       type: 'P',
-      name: this._portal // AWS Redshift requires a portal name
+      name: this._portal, // AWS Redshift requires a portal name
     },
     true
   )
@@ -165,7 +165,7 @@ Cursor.prototype._getRows = function (rows, cb) {
   this._rows = []
   const msg = {
     portal: this._portal,
-    rows: rows
+    rows: rows,
   }
   this.connection.execute(msg, true)
   this.connection.flush()

packages/pg-cursor/package.json

@@ -7,8 +7,7 @@
     "test": "test"
   },
   "scripts": {
-    "test": "mocha && eslint .",
-    "lint": "eslint ."
+    "test": "mocha"
   },
   "repository": {
     "type": "git",
@@ -17,17 +16,7 @@
   "author": "Brian M. Carlson",
   "license": "MIT",
   "devDependencies": {
-    "eslint": "^6.5.1",
-    "eslint-config-prettier": "^6.4.0",
-    "eslint-plugin-prettier": "^3.1.1",
     "mocha": "^6.2.2",
-    "pg": "^8.0.2",
-    "prettier": "^1.18.2"
-  },
-  "prettier": {
-    "semi": false,
-    "printWidth": 120,
-    "trailingComma": "none",
-    "singleQuote": true
+    "pg": "^8.0.2"
   }
 }

packages/pg-cursor/test/error-handling.js

@@ -5,14 +5,14 @@ const pg = require('pg')
 
 const text = 'SELECT generate_series as num FROM generate_series(0, 4)'
 
-describe('error handling', function() {
-  it('can continue after error', function(done) {
+describe('error handling', function () {
+  it('can continue after error', function (done) {
     const client = new pg.Client()
     client.connect()
     const cursor = client.query(new Cursor('asdfdffsdf'))
-    cursor.read(1, function(err) {
+    cursor.read(1, function (err) {
       assert(err)
-      client.query('SELECT NOW()', function(err) {
+      client.query('SELECT NOW()', function (err) {
         assert.ifError(err)
         client.end()
         done()
@@ -22,16 +22,16 @@ describe('error handling', function() {
 })
 
 describe('read callback does not fire sync', () => {
-  it('does not fire error callback sync', done => {
+  it('does not fire error callback sync', (done) => {
     const client = new pg.Client()
     client.connect()
     const cursor = client.query(new Cursor('asdfdffsdf'))
     let after = false
-    cursor.read(1, function(err) {
+    cursor.read(1, function (err) {
       assert(err, 'error should be returned')
       assert.strictEqual(after, true, 'should not call read sync')
       after = false
-      cursor.read(1, function(err) {
+      cursor.read(1, function (err) {
         assert(err, 'error should be returned')
         assert.strictEqual(after, true, 'should not call read sync')
         client.end()
@@ -42,18 +42,18 @@ describe('read callback does not fire sync', () => {
     after = true
   })
 
-  it('does not fire result sync after finished', done => {
+  it('does not fire result sync after finished', (done) => {
     const client = new pg.Client()
     client.connect()
     const cursor = client.query(new Cursor('SELECT NOW()'))
     let after = false
-    cursor.read(1, function(err) {
+    cursor.read(1, function (err) {
       assert(!err)
       assert.strictEqual(after, true, 'should not call read sync')
-      cursor.read(1, function(err) {
+      cursor.read(1, function (err) {
         assert(!err)
         after = false
-        cursor.read(1, function(err) {
+        cursor.read(1, function (err) {
           assert(!err)
           assert.strictEqual(after, true, 'should not call read sync')
           client.end()
@@ -66,16 +66,16 @@ describe('read callback does not fire sync', () => {
   })
 })
 
-describe('proper cleanup', function() {
-  it('can issue multiple cursors on one client', function(done) {
+describe('proper cleanup', function () {
+  it('can issue multiple cursors on one client', function (done) {
     const client = new pg.Client()
     client.connect()
     const cursor1 = client.query(new Cursor(text))
-    cursor1.read(8, function(err, rows) {
+    cursor1.read(8, function (err, rows) {
       assert.ifError(err)
       assert.strictEqual(rows.length, 5)
       const cursor2 = client.query(new Cursor(text))
-      cursor2.read(8, function(err, rows) {
+      cursor2.read(8, function (err, rows) {
         assert.ifError(err)
         assert.strictEqual(rows.length, 5)
         client.end()