Use object destructuring

Author: pspi

.eslintrc.js

@@ -14,5 +14,7 @@ module.exports = {
     'prefer-const': ['error'],
     'no-var': ['error'],
     'no-unused-vars': ['error', { args: 'none' }],
+    'prefer-destructuring': ['error', { array: false }],
+    'no-useless-rename': ['error'],
   },
 }

lib/deparser.js

@@ -8,10 +8,10 @@ module.exports = function (txt, options) {
   return new CopyStream(txt, options)
 }
 
-const Transform = require('stream').Transform
+const { Transform } = require('stream')
 
 const BufferPut = require('bufferput')
-const deparse = require('./pg_types').deparse
+const { deparse } = require('./pg_types')
 
 class CopyStream extends Transform {
   constructor(options = {}) {

lib/parser.js

@@ -8,9 +8,9 @@ module.exports = function (txt, options) {
   return new CopyStream(txt, options)
 }
 
-const Transform = require('stream').Transform
+const { Transform } = require('stream')
 const BP = require('bufferput')
-const parse = require('./pg_types').parse
+const { parse } = require('./pg_types')
 
 class CopyStream extends Transform {
   constructor(options) {

lib/transform.js

@@ -13,8 +13,8 @@ const shift = function () {
 }
 
 module.exports = function (opt) {
-  const mapping = opt.mapping
-  const transform = opt.transform
+  const { mapping } = opt
+  const { transform } = opt
   const copyIns = opt.targets
 
   const first = parser({ mapping: mapping })

test/copy-in.js

@@ -1,8 +1,8 @@
 const assert = require('assert')
 const gonna = require('gonna')
 const pg = require('pg')
-const deparser = require('../').deparser
-const copy = require('pg-copy-streams').from
+const { deparser } = require('../')
+const { from: copyFrom } = require('pg-copy-streams')
 
 const client = function () {
   const client = new pg.Client()
@@ -14,7 +14,7 @@ const testEmpty = function () {
   const fromClient = client()
   fromClient.query('CREATE TEMP TABLE plug (col1 text)')
   const txt = 'COPY plug FROM STDIN BINARY'
-  const copyIn = fromClient.query(copy(txt))
+  const copyIn = fromClient.query(copyFrom(txt))
   const copyUn = deparser({ objectMode: true })
   copyUn.pipe(copyIn)
   copyUn.end()
@@ -42,7 +42,7 @@ const testType = function (type, ndim, value, expectedText) {
   fromClient.query('CREATE TEMP TABLE plug (col1 ' + coltype + ')')
 
   const txt = 'COPY plug FROM STDIN BINARY'
-  const copyIn = fromClient.query(copy(txt))
+  const copyIn = fromClient.query(copyFrom(txt))
   const copyUn = deparser({ objectMode: true })
   copyUn.pipe(copyIn)
   copyUn.end([{ type: atype, value: value }])

test/copy-out.js

@@ -1,8 +1,8 @@
 const assert = require('assert')
 const gonna = require('gonna')
 const pg = require('pg')
-const parser = require('../').parser
-const copy = require('pg-copy-streams').to
+const { parser } = require('../')
+const { to: copyTo } = require('pg-copy-streams')
 const through2 = require('through2')
 
 const client = function () {
@@ -46,7 +46,7 @@ const testParser = function () {
   }
 
   const txt = 'COPY plug TO STDOUT BINARY'
-  const copyOut = fromClient.query(copy(txt))
+  const copyOut = fromClient.query(copyTo(txt))
   const p = parser({ objectMode: true, mapping: mapping })
 
   const countDone = gonna('have correct count')

test/deparse.js

@@ -1,7 +1,7 @@
 const assert = require('assert')
 
 const pgtypes = require('../lib/pg_types')
-const deparse = pgtypes.deparse
+const { deparse } = pgtypes
 
 const BP = require('bufferput')
 const samples = require('./samples')

test/parse.js

@@ -1,7 +1,7 @@
 const assert = require('assert')
 
 const pgtypes = require('../lib/pg_types')
-const parse = pgtypes.parse
+const { parse } = pgtypes
 
 const samples = require('./samples')
 

test/samples.js

@@ -1,5 +1,5 @@
 const pgtypes = require('../lib/pg_types')
-const types = pgtypes.types
+const { types } = pgtypes
 const BP = require('bufferput')
 
 BP.prototype.string = function (s, enc) {

test/samples_coverage.js

@@ -1,7 +1,7 @@
 const assert = require('assert')
 
 const pgtypes = require('../lib/pg_types')
-const types = pgtypes.types
+const { types } = pgtypes
 
 const samples = require('./samples')
 

test/transform.js

@@ -2,11 +2,10 @@ const assert = require('assert')
 const async = require('async')
 
 const pg = require('pg')
-const pgCopyOut = require('pg-copy-streams').to
-const pgCopyIn = require('pg-copy-streams').from
+const { to: pgCopyTo, from: pgCopyFrom } = require('pg-copy-streams')
 const through2 = require('through2')
 
-const pgCopyTransform = require('../').transform
+const { transform } = require('../')
 
 const client = function (dsn) {
   const client = new pg.Client(dsn)
@@ -36,14 +35,14 @@ const queriesC = ['DROP TABLE IF EXISTS generated', 'CREATE TABLE generated (bod
 async.eachSeries(queriesA.concat(queriesB, queriesC), clientA.query.bind(clientA), function (err) {
   assert.ifError(err)
 
-  const copyOut = clientA.query(pgCopyOut('COPY item TO STDOUT BINARY'))
+  const copyOut = clientA.query(pgCopyTo('COPY item TO STDOUT BINARY'))
   const copyIns = [
-    clientB.query(pgCopyIn('COPY product   FROM STDIN BINARY')),
-    clientC.query(pgCopyIn('COPY generated FROM STDIN BINARY')),
+    clientB.query(pgCopyFrom('COPY product   FROM STDIN BINARY')),
+    clientC.query(pgCopyFrom('COPY generated FROM STDIN BINARY')),
   ]
 
   let count = 0
-  const pct = pgCopyTransform({
+  const pct = transform({
     mapping: [
       { key: 'id', type: 'int4' },
       { key: 'ref', type: 'text' },