Sensible coverage

porsager · porsager · commit cb19bfc16b87 · 2019-12-20T23:58:34.000+01:00
diff --git a/lib/backend.js b/lib/backend.js
@@ -51,8 +51,6 @@ function Backend({
     secret    : null
   }
 
-  return backend
-
   /* c8 ignore next 3 */
   function ParseComplete() {
     onparse()
@@ -69,6 +67,7 @@ function Backend({
   }
 
   function NotificationResponse(x) {
+    /* c8 ignore next 2 */
     if (!onnotify)
       return
 
@@ -81,6 +80,7 @@ function Backend({
   }
 
   function CommandComplete(x) {
+    /* c8 ignore next 2 */
     if (!backend.query)
       return
 
@@ -166,7 +166,9 @@ function Backend({
     const type = x.readInt32BE(5)
     try {
       type !== 0 && onauth(type, x)
-    } catch (err) {
+    }
+    /* c8 ignore next 3 */
+    catch (err) {
       error(err)
     }
   }
@@ -229,6 +231,9 @@ function Backend({
   function ReadyForQuery() {
     onready(backend.error)
   }
+
+  /* c8 ignore next */
+  return backend
 }
 
 function parseError(x) {
diff --git a/lib/bytes.js b/lib/bytes.js
@@ -67,6 +67,7 @@ const b = {
     const out = buffer.slice(0, b.i)
     b.i = 0
     buffer = Buffer.allocUnsafe(size)
+    /* c8 ignore next */
     return out
   }
 }
diff --git a/lib/connection.js b/lib/connection.js
@@ -51,8 +51,6 @@ function Connection(options = {}) {
     error
   })
 
-  return connection
-
   function onparse() {
     if (backend.query && backend.query.statement.sig)
       statements[backend.query.statement.sig] = backend.query.statement
@@ -185,19 +183,6 @@ function postgresSocket(options, {
   let socket
   let closed = true
 
-  return {
-    ready: false,
-    write: x => socket.write(x),
-    destroy: () => {
-      socket.destroy()
-      return Promise.resolve()
-    },
-    end: () => {
-      return new Promise(r => socket && socket.end(r))
-    },
-    connect
-  }
-
   function onclose() {
     socket.removeListener('data', data)
     socket.removeListener('error', error)
@@ -208,8 +193,8 @@ function postgresSocket(options, {
   }
 
   function connect() {
-    if (!closed)
-      return
+    /* c8 ignore next */
+    if (!closed) return
 
     closed = false
 
@@ -228,6 +213,7 @@ function postgresSocket(options, {
       socket.removeListener('close', onclose)
       x.toString() === 'S'
         ? attach(tls.connect(Object.assign({ socket }, options.ssl)))
+        /* c8 ignore next */
         : error('Server does not support SSL')
     })
   }
@@ -240,4 +226,20 @@ function postgresSocket(options, {
     socket.once('secureConnect', ready)
     socket.once('close', onclose)
   }
+
+  const x = {
+    ready: false,
+    write: x => socket.write(x),
+    destroy: () => {
+      socket.destroy()
+      return Promise.resolve()
+    },
+    end: () => {
+      return new Promise(r => socket && socket.end(r))
+    },
+    connect
+  }
+
+  /* c8 ignore next */
+  return x
 }
diff --git a/lib/frontend.js b/lib/frontend.js
@@ -58,7 +58,14 @@ function connect({ user, database, connection }) {
 }
 
 function auth(type, x, options) {
-  return (auths[type] || authNotImplemented)(type, x, options) || ''
+  if (type in auths)
+    return auths[type](type, x, options)
+  /* c8 ignore next 5 */
+  throw errors.generic({
+    message: 'Auth type ' + (authNames[type] || type) + ' not implemented',
+    type: authNames[type] || type,
+    code: 'AUTH_TYPE_NOT_IMPLEMENTED'
+  })
 }
 
 function AuthenticationCleartextPassword(type, x, { pass }) {
@@ -115,21 +122,12 @@ function SASLContinue(type, x, options) {
 }
 
 function SASLFinal(type, x, options) {
-  if (x.utf8Slice(9).split(N, 1)[0].slice(2) !== options.serverSignature) {
-    /* c8 ignore next 5 */
-    throw errors.generic({
-      message: 'The server did not return the correct signature',
-      code: 'SASL_SIGNATURE_MISMATCH'
-    })
-  }
-}
-
-/* c8 ignore next 7 */
-function authNotImplemented(type) {
+  if (x.utf8Slice(9).split(N, 1)[0].slice(2) === options.serverSignature)
+    return ''
+  /* c8 ignore next 4 */
   throw errors.generic({
-    message: 'Auth type ' + (authNames[type] || type) + ' not implemented',
-    type: authNames[type] || type,
-    code: 'AUTH_TYPE_NOT_IMPLEMENTED'
+    message: 'The server did not return the correct signature',
+    code: 'SASL_SIGNATURE_MISMATCH'
   })
 }
 

Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,6 @@ function Backend({`
`51`	`51`	`secret : null`
`52`	`52`	`}`
`53`	`53`
`54`		`- return backend`
`55`		`-`
`56`	`54`	`/* c8 ignore next 3 */`
`57`	`55`	`function ParseComplete() {`
`58`	`56`	`onparse()`
`@@ -69,6 +67,7 @@ function Backend({`
`69`	`67`	`}`
`70`	`68`
`71`	`69`	`function NotificationResponse(x) {`
	`70`	`+ /* c8 ignore next 2 */`
`72`	`71`	`if (!onnotify)`
`73`	`72`	`return`
`74`	`73`
`@@ -81,6 +80,7 @@ function Backend({`
`81`	`80`	`}`
`82`	`81`
`83`	`82`	`function CommandComplete(x) {`
	`83`	`+ /* c8 ignore next 2 */`
`84`	`84`	`if (!backend.query)`
`85`	`85`	`return`
`86`	`86`
`@@ -166,7 +166,9 @@ function Backend({`
`166`	`166`	`const type = x.readInt32BE(5)`
`167`	`167`	`try {`
`168`	`168`	`type !== 0 && onauth(type, x)`
`169`		`- } catch (err) {`
	`169`	`+ }`
	`170`	`+ /* c8 ignore next 3 */`
	`171`	`+ catch (err) {`
`170`	`172`	`error(err)`
`171`	`173`	`}`
`172`	`174`	`}`
`@@ -229,6 +231,9 @@ function Backend({`
`229`	`231`	`function ReadyForQuery() {`
`230`	`232`	`onready(backend.error)`
`231`	`233`	`}`
	`234`	`+`
	`235`	`+ /* c8 ignore next */`
	`236`	`+ return backend`
`232`	`237`	`}`
`233`	`238`
`234`	`239`	`function parseError(x) {`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ const b = {`
`67`	`67`	`const out = buffer.slice(0, b.i)`
`68`	`68`	`b.i = 0`
`69`	`69`	`buffer = Buffer.allocUnsafe(size)`
	`70`	`+ /* c8 ignore next */`
`70`	`71`	`return out`
`71`	`72`	`}`
`72`	`73`	`}`