pg-promise 12.1.2 → 12.1.3

package/lib/database.js

@@ -18,7 +18,7 @@ const npm = {
     utils: require('./utils'),
     pubUtils: require('./utils/public'),
     connect: require('./connect'),
-    query: require('./query'),
+    query: require('./query').query,
     task: require('./task'),
     text: require('./text')
 };
@@ -1612,7 +1612,7 @@ function onError(err) {
 module.exports = config => {
     const npmLocal = config.$npm;
     npmLocal.connect = npmLocal.connect || npm.connect(config);
-    npmLocal.query = npmLocal.query || npm.query();
+    npmLocal.query = npmLocal.query || npm.query;
     npmLocal.task = npmLocal.task || npm.task(config);
     return Database;
 };

package/lib/query.js

@@ -18,7 +18,7 @@ const npm = {
     utils: require('./utils'),
     formatting: require('./formatting'),
     errors: require('./errors'),
-    stream: require('./stream'),
+    stream: require('./stream').stream,
     text: require('./text')
 };
 
@@ -270,4 +270,4 @@ function makeIterable(r) {
     };
 }
 
-module.exports = () => $query;
+module.exports = {query: $query};

package/lib/special-query.js

@@ -27,4 +27,4 @@ const cache = {
     streamQuery: new SpecialQuery(specialQueryType.stream)
 };
 
-module.exports = Object.assign({SpecialQuery}, cache);
+module.exports = {SpecialQuery, ...cache};

package/lib/stream.js

@@ -122,4 +122,4 @@ function $stream(ctx, qs, initCB) {
 
 }
 
-module.exports = $stream;
+module.exports = {stream: $stream};

package/lib/task.js

@@ -13,7 +13,7 @@ const npm = {
     spex: require('spex'),
     utils: require('./utils'),
     mode: require('./tx-mode'),
-    query: require('./query'),
+    query: require('./query').query,
     text: require('./text')
 };
 
@@ -323,13 +323,8 @@ const execute = (ctx, obj, isTX, config) => {
 
 module.exports = config => {
     const npmLocal = config.$npm;
-
-    // istanbul ignore next:
-    // we keep 'npm.query' initialization here, even though it is always
-    // pre-initialized by the 'database' module, for integrity purpose.
-    npmLocal.query = npmLocal.query || npm.query();
+    npmLocal.query = npmLocal.query || npm.query;
     npmLocal.spex = npmLocal.spex || npm.spex;
-
     return {
         Task, execute, callback
     };

package/lib/utils/color.js

@@ -1,4 +1,4 @@
-const util = require('util');
+const {format} = require('util');
 
 class ColorConsole {
 
@@ -41,7 +41,7 @@ class ColorConsole {
     }
 
     static formatColor(args, color) {
-        return args.map(a => `\x1b[${color}m${util.format(a)}\x1b[0m`);
+        return args.map(a => `\x1b[${color}m${format(a)}\x1b[0m`);
     }
 }
 

package/lib/utils/index.js

@@ -57,11 +57,11 @@ function addReadProp(obj, name, value, hidden) {
 
 //////////////////////////////////////////////////////////////
 // Converts a connection string or object into its safe copy:
-// if password is present, it is masked with symbol '#'.
+// if a password is present, it is masked with the symbol '#'.
 function getSafeConnection(cn) {
     const maskPassword = cs => cs.replace(/:(?![/])([^@]+)/, (_, m) => ':' + new Array(m.length + 1).join('#'));
     if (typeof cn === 'object') {
-        const copy = Object.assign({}, cn);
+        const copy = {...cn};
         if (typeof copy.password === 'string') {
             copy.password = copy.password.replace(/./g, '#');
         }
@@ -88,7 +88,7 @@ function inherits(child, parent) {
 // istanbul ignore next
 function getLocalStack(startIdx, maxLines) {
     // from the call stack, we take up to maximum lines,
-    // starting with specified line index:
+    // starting with the specified line index:
     startIdx = startIdx || 0;
     const endIdx = maxLines > 0 ? startIdx + maxLines : undefined;
     return new Error().stack
@@ -105,8 +105,8 @@ function InternalError(error) {
 }
 
 /////////////////////////////////////////////////////////////////
-// Parses a property name, and gets its name from the object,
-// if the property exists. Returns object {valid, has, target, value}:
+// Parses a property name and gets its name from the object
+// if the property exists. Returns an object {valid, has, target, value}:
 //  - valid - true/false, whether the syntax is valid
 //  - has - a flag that property exists; set when 'valid' = true
 //  - target - the target object that contains the property; set when 'has' = true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-promise",
-  "version": "12.1.2",
+  "version": "12.1.3",
   "description": "PostgreSQL interface for Node.js",
   "main": "lib/index.js",
   "typings": "typescript/pg-promise.d.ts",