Implement feedback

Author: brianc

.gitignore

@@ -7,3 +7,4 @@ package-lock.json
 *.swp
 dist
 .DS_Store
+.vscode/

packages/pg-pool/index.js

@@ -12,20 +12,20 @@ const removeWhere = (list, predicate) => {
 }
 
 class IdleItem {
-  constructor(client, idleListener, timeoutId) {
+  constructor (client, idleListener, timeoutId) {
     this.client = client
     this.idleListener = idleListener
     this.timeoutId = timeoutId
   }
 }
 
 class PendingItem {
-  constructor(callback) {
+  constructor (callback) {
     this.callback = callback
   }
 }
 
-function promisify(Promise, callback) {
+function promisify (Promise, callback) {
   if (callback) {
     return { callback: callback, result: undefined }
   }
@@ -41,8 +41,8 @@ function promisify(Promise, callback) {
   return { callback: cb, result: result }
 }
 
-function makeIdleListener(pool, client) {
-  return function idleListener(err) {
+function makeIdleListener (pool, client) {
+  return function idleListener (err) {
     err.client = client
 
     client.removeListener('error', idleListener)
@@ -57,24 +57,18 @@ function makeIdleListener(pool, client) {
 }
 
 class Pool extends EventEmitter {
-  constructor(options, Client) {
+  constructor (options, Client) {
     super()
-
+    this.options = Object.assign({}, options)
+    const password = this.options.password
     // "hiding" the password so it doesn't show up in stack traces
     // or if the client is console.logged
-    const optionsWithPasswordHidden = Object.assign({}, options)
-    let password = optionsWithPasswordHidden.password
-    Object.defineProperty(optionsWithPasswordHidden, 'password', {
+    Object.defineProperty(this.options, 'password', {
+      configurable: true,
       enumerable: false,
-      get() {
-        return password
-      },
-      set(value) {
-        password = value
-      }
+      value: password,
+      writable: true
     })
-
-    this.options = optionsWithPasswordHidden
     this.options.max = this.options.max || this.options.poolSize || 10
     this.log = this.options.log || function () { }
     this.Client = this.options.Client || Client || require('pg').Client
@@ -92,11 +86,11 @@ class Pool extends EventEmitter {
     this.ended = false
   }
 
-  _isFull() {
+  _isFull () {
     return this._clients.length >= this.options.max
   }
 
-  _pulseQueue() {
+  _pulseQueue () {
     this.log('pulse queue')
     if (this.ended) {
       this.log('pulse queue ended')
@@ -139,7 +133,7 @@ class Pool extends EventEmitter {
     throw new Error('unexpected condition')
   }
 
-  _remove(client) {
+  _remove (client) {
     const removed = removeWhere(
       this._idle,
       item => item.client === client
@@ -154,7 +148,7 @@ class Pool extends EventEmitter {
     this.emit('remove', client)
   }
 
-  connect(cb) {
+  connect (cb) {
     if (this.ending) {
       const err = new Error('Cannot use a pool after calling end on the pool')
       return cb ? cb(err) : this.Promise.reject(err)
@@ -200,7 +194,7 @@ class Pool extends EventEmitter {
     return result
   }
 
-  newClient(pendingItem) {
+  newClient (pendingItem) {
     const client = new this.Client(this.options)
     this._clients.push(client)
     const idleListener = makeIdleListener(this, client)
@@ -248,7 +242,7 @@ class Pool extends EventEmitter {
   }
 
   // acquire a client for a pending work item
-  _acquireClient(client, pendingItem, idleListener, isNew) {
+  _acquireClient (client, pendingItem, idleListener, isNew) {
     if (isNew) {
       this.emit('connect', client)
     }
@@ -292,7 +286,7 @@ class Pool extends EventEmitter {
 
   // release a client back to the poll, include an error
   // to remove it from the pool
-  _release(client, idleListener, err) {
+  _release (client, idleListener, err) {
     client.on('error', idleListener)
 
     if (err || this.ending) {
@@ -314,7 +308,7 @@ class Pool extends EventEmitter {
     this._pulseQueue()
   }
 
-  query(text, values, cb) {
+  query (text, values, cb) {
     // guard clause against passing a function as the first parameter
     if (typeof text === 'function') {
       const response = promisify(this.Promise, text)
@@ -367,7 +361,7 @@ class Pool extends EventEmitter {
     return response.result
   }
 
-  end(cb) {
+  end (cb) {
     this.log('ending')
     if (this.ending) {
       const err = new Error('Called end on pool more than once')
@@ -380,15 +374,15 @@ class Pool extends EventEmitter {
     return promised.result
   }
 
-  get waitingCount() {
+  get waitingCount () {
     return this._pendingQueue.length
   }
 
-  get idleCount() {
+  get idleCount () {
     return this._idle.length
   }
 
-  get totalCount() {
+  get totalCount () {
     return this._clients.length
   }
 }

packages/pg/lib/client.js

@@ -33,16 +33,12 @@ var Client = function (config) {
 
   // "hiding" the password so it doesn't show up in stack traces
   // or if the client is console.logged
-  let password = this.connectionParameters.password
+  const password = this.connectionParameters.password
   Object.defineProperty(this, 'password', {
     enumerable: false,
     configurable: false,
-    get() {
-      return password
-    },
-    set(value) {
-      password = value
-    }
+    writable: true,
+    value: password
   })
 
   this.replication = this.connectionParameters.replication

packages/pg/lib/connection-parameters.js

@@ -61,9 +61,8 @@ var ConnectionParameters = function (config) {
   Object.defineProperty(this, 'password', {
     enumerable: false,
     configurable: false,
-    get() {
-      return password
-    }
+    writable: false,
+    value: password
   })
 
   this.binary = val('binary', config)