chore(pg-connection-string): use tsx for tests

Author: hjr3

packages/pg-connection-string/.gitignore

@@ -12,6 +12,7 @@ lib-cov
 
 # Coverage directory used by tools like istanbul
 coverage
+.nyc_output
 
 # Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
 .grunt
@@ -23,4 +24,7 @@ build/Release
 # Deployed apps should consider commenting this line out:
 # see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git
 node_modules
-package-lock.json
+package-lock.json
+
+# TypeScript output directory
+dist

packages/pg-connection-string/.mocharc.json

@@ -0,0 +1,4 @@
+{
+  "extension": ["js", "ts"],
+  "require": "tsx"
+}

packages/pg-connection-string/.nyc_output/processinfo/index.json

@@ -0,0 +1 @@
+{"processes":{"7702f7d6-fe80-4107-8fc1-2818e7cb6a88":{"parent":null,"children":[]}},"files":{"/Users/herman/Code/node-postgres/packages/pg-connection-string/index.js":["7702f7d6-fe80-4107-8fc1-2818e7cb6a88"]},"externalIds":{}}

packages/pg-connection-string/README.md

@@ -3,9 +3,6 @@ pg-connection-string
 
 [![NPM](https://nodei.co/npm/pg-connection-string.png?compact=true)](https://nodei.co/npm/pg-connection-string/)
 
-[![Build Status](https://travis-ci.org/iceddev/pg-connection-string.svg?branch=master)](https://travis-ci.org/iceddev/pg-connection-string)
-[![Coverage Status](https://coveralls.io/repos/github/iceddev/pg-connection-string/badge.svg?branch=master)](https://coveralls.io/github/iceddev/pg-connection-string?branch=master)
-
 Functions for dealing with a PostgresSQL connection string
 
 `parse` method taken from [node-postgres](https://github.com/brianc/node-postgres.git)

packages/pg-connection-string/index.d.ts

@@ -7,18 +7,29 @@ export interface Options {
   useLibpqCompat?: boolean
 }
 
+interface SSLConfig {
+  ca?: string
+  cert?: string | null
+  key?: string
+  rejectUnauthorized?: boolean
+}
+
 export interface ConnectionOptions {
   host: string | null
   password?: string
   user?: string
   port?: string | null
   database: string | null | undefined
   client_encoding?: string
-  ssl?: boolean | string
+  ssl?: boolean | string | SSLConfig
 
   application_name?: string
   fallback_application_name?: string
   options?: string
+  keepalives?: number
+
+  // We allow any other options to be passed through
+  [key: string]: unknown
 }
 
 export function toClientConfig(config: ConnectionOptions): ClientConfig

packages/pg-connection-string/index.js

@@ -169,12 +169,8 @@ function toClientConfig(config) {
       if (typeof sslConfig === 'boolean') {
         c[key] = sslConfig
       }
-      // else path is taken. multiple tests produce a sslConfig that is an object
-      // and we can console.log to see that we take this path
-      //
-      // see https://github.com/istanbuljs/babel-plugin-istanbul/issues/186#issuecomment-1137765139
-      // istanbul ignore else
-      else if (typeof sslConfig === 'object') {
+
+      if (typeof sslConfig === 'object') {
         c[key] = toConnectionOptions(sslConfig)
       }
     } else if (value !== undefined && value !== null) {

packages/pg-connection-string/package.json

@@ -13,9 +13,8 @@
     }
   },
   "scripts": {
-    "test": "istanbul cover _mocha && npm run check-coverage",
-    "check-coverage": "istanbul check-coverage --statements 100 --branches 100 --lines 100 --functions 100",
-    "coveralls": "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls"
+    "test": "nyc --reporter=lcov mocha && npm run check-coverage",
+    "check-coverage": "nyc check-coverage --statements 100 --branches 100 --lines 100 --functions 100"
   },
   "repository": {
     "type": "git",
@@ -35,10 +34,14 @@
   },
   "homepage": "https://github.com/brianc/node-postgres/tree/master/packages/pg-connection-string",
   "devDependencies": {
+    "@types/pg": "^8.12.0",
     "chai": "^4.1.1",
     "coveralls": "^3.0.4",
     "istanbul": "^0.4.5",
-    "mocha": "^10.5.2"
+    "mocha": "^10.5.2",
+    "nyc": "^15",
+    "tsx": "^4.19.4",
+    "typescript": "^4.0.3"
   },
   "files": [
     "index.js",

…g-connection-string/test/clientConfig.js …g-connection-string/test/clientConfig.tspackages/pg-connection-string/test/clientConfig.js renamed to packages/pg-connection-string/test/clientConfig.ts packages/pg-connection-string/test/clientConfig.js renamed to packages/pg-connection-string/test/clientConfig.ts

@@ -1,21 +1,19 @@
-'use strict'
-
-const chai = require('chai')
+import chai from 'chai'
 const expect = chai.expect
 chai.should()
 
-const { parse, toClientConfig, parseIntoClientConfig } = require('../')
+import { parse, toClientConfig, parseIntoClientConfig } from '../'
 
 describe('toClientConfig', function () {
   it('converts connection info', function () {
     const config = parse('postgres://brian:pw@boom:381/lala')
     const clientConfig = toClientConfig(config)
 
-    clientConfig.user.should.equal('brian')
-    clientConfig.password.should.equal('pw')
-    clientConfig.host.should.equal('boom')
-    clientConfig.port.should.equal(381)
-    clientConfig.database.should.equal('lala')
+    clientConfig.user?.should.equal('brian')
+    clientConfig.password?.should.equal('pw')
+    clientConfig.host?.should.equal('boom')
+    clientConfig.port?.should.equal(381)
+    clientConfig.database?.should.equal('lala')
   })
 
   it('converts query params', function () {
@@ -24,45 +22,47 @@ describe('toClientConfig', function () {
     )
     const clientConfig = toClientConfig(config)
 
-    clientConfig.application_name.should.equal('TheApp')
-    clientConfig.fallback_application_name.should.equal('TheAppFallback')
-    clientConfig.client_encoding.should.equal('utf8')
-    clientConfig.options.should.equal('-c geqo=off')
+    clientConfig.application_name?.should.equal('TheApp')
+    clientConfig.fallback_application_name?.should.equal('TheAppFallback')
+    clientConfig.client_encoding?.should.equal('utf8')
+    clientConfig.options?.should.equal('-c geqo=off')
   })
 
   it('converts SSL boolean', function () {
     const config = parse('pg:///?ssl=true')
     const clientConfig = toClientConfig(config)
 
-    clientConfig.ssl.should.equal(true)
+    clientConfig.ssl?.should.equal(true)
   })
 
   it('converts sslmode=disable', function () {
     const config = parse('pg:///?sslmode=disable')
     const clientConfig = toClientConfig(config)
 
-    clientConfig.ssl.should.equal(false)
+    clientConfig.ssl?.should.equal(false)
   })
 
   it('converts sslmode=noverify', function () {
     const config = parse('pg:///?sslmode=no-verify')
     const clientConfig = toClientConfig(config)
 
-    clientConfig.ssl.rejectUnauthorized.should.equal(false)
+    clientConfig.ssl?.should.deep.equal({
+      rejectUnauthorized: false,
+    })
   })
 
   it('converts other sslmode options', function () {
     const config = parse('pg:///?sslmode=verify-ca')
     const clientConfig = toClientConfig(config)
 
-    clientConfig.ssl.should.deep.equal({})
+    clientConfig.ssl?.should.deep.equal({})
   })
 
   it('converts other sslmode options', function () {
     const config = parse('pg:///?sslmode=verify-ca')
     const clientConfig = toClientConfig(config)
 
-    clientConfig.ssl.should.deep.equal({})
+    clientConfig.ssl?.should.deep.equal({})
   })
 
   it('converts ssl cert options', function () {
@@ -77,7 +77,7 @@ describe('toClientConfig', function () {
     const config = parse(connectionString)
     const clientConfig = toClientConfig(config)
 
-    clientConfig.ssl.should.deep.equal({
+    clientConfig.ssl?.should.deep.equal({
       ca: 'example ca\n',
       cert: 'example cert\n',
       key: 'example key\n',
@@ -87,9 +87,9 @@ describe('toClientConfig', function () {
   it('converts unix domain sockets', function () {
     const config = parse('socket:/some path/?db=my[db]&encoding=utf8&client_encoding=bogus')
     const clientConfig = toClientConfig(config)
-    clientConfig.host.should.equal('/some path/')
-    clientConfig.database.should.equal('my[db]', 'must to be escaped and unescaped through "my%5Bdb%5D"')
-    clientConfig.client_encoding.should.equal('utf8')
+    clientConfig.host?.should.equal('/some path/')
+    clientConfig.database?.should.equal('my[db]', 'must to be escaped and unescaped through "my%5Bdb%5D"')
+    clientConfig.client_encoding?.should.equal('utf8')
   })
 
   it('handles invalid port', function () {
@@ -106,20 +106,20 @@ describe('toClientConfig', function () {
 
     const clientConfig = toClientConfig(config)
 
-    clientConfig.host.should.equal('boom')
-    clientConfig.database.should.equal('lala')
-    clientConfig.ssl.should.deep.equal({})
+    clientConfig.host?.should.equal('boom')
+    clientConfig.database?.should.equal('lala')
+    clientConfig.ssl?.should.deep.equal({})
   })
 })
 
 describe('parseIntoClientConfig', function () {
   it('converts url', function () {
     const clientConfig = parseIntoClientConfig('postgres://brian:pw@boom:381/lala')
 
-    clientConfig.user.should.equal('brian')
-    clientConfig.password.should.equal('pw')
-    clientConfig.host.should.equal('boom')
-    clientConfig.port.should.equal(381)
-    clientConfig.database.should.equal('lala')
+    clientConfig.user?.should.equal('brian')
+    clientConfig.password?.should.equal('pw')
+    clientConfig.host?.should.equal('boom')
+    clientConfig.port?.should.equal(381)
+    clientConfig.database?.should.equal('lala')
   })
 })