pg-promise 12.1.2 → 12.2.0

package/README.md

@@ -3,7 +3,7 @@ pg-promise
 
 [![Build Status](https://github.com/vitaly-t/pg-promise/actions/workflows/ci.yml/badge.svg)](https://github.com/vitaly-t/pg-promise/actions/workflows/ci.yml)
 [![Node Version](https://img.shields.io/badge/nodejs-16%20--%2024-green.svg?logo=node.js&style=flat)](https://nodejs.org)
-[![Postgres Version](https://img.shields.io/badge/postgresql-10%20--%2017-green.svg?logo=postgresql&style=flat)](https://www.postgresql.org)
+[![Postgres Version](https://img.shields.io/badge/postgresql-10%20--%2018-green.svg?logo=postgresql&style=flat)](https://www.postgresql.org)
 
 ---
 

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')
 };
@@ -1233,30 +1233,11 @@ function Database(cn, dc, config) {
          *
          * @example
          *
-         * db.task('my-task', t => {
+         * db.task('my-task', async t => {
          *         // t.ctx = task context object
          *
-         *         return t.one('SELECT id FROM Users WHERE name = $1', 'John')
-         *             .then(user => {
-         *                 return t.any('SELECT * FROM Events WHERE userId = $1', user.id);
-         *             });
-         *     })
-         *     .then(data => {
-         *         // success
-         *         // data = as returned from the task's callback
-         *     })
-         *     .catch(error => {
-         *         // error
-         *     });
-         *
-         * @example
-         *
-         * // using an ES7 syntax for the callback:
-         * db.task('my-task', async t {
-         *         // t.ctx = task context object
-         *
-         *         const user = await t.one('SELECT id FROM Users WHERE name = $1', 'John');
-         *         return t.any('SELECT * FROM Events WHERE userId = $1', user.id);
+         *         const user = await t.one('SELECT id FROM Users WHERE name = $1', ['John']);
+         *         return t.any('SELECT * FROM Events WHERE userId = $1', [user.id]);
          *     })
          *     .then(data => {
          *         // success
@@ -1419,7 +1400,7 @@ function Database(cn, dc, config) {
          * @example
          *
          * // using an ES7 syntax for the callback:
-         * db.tx('my-transaction', async t {
+         * db.tx('my-transaction', async t => {
          *         // t.ctx = transaction context object
          *
          *         const user = await t.one('INSERT INTO Users(name, age) VALUES($1, $2) RETURNING id', ['Mike', 25]);
@@ -1432,7 +1413,6 @@ function Database(cn, dc, config) {
          *     .catch(error => {
          *         // error
          *     });
-         *
          */
         obj.tx = function () {
             const args = npm.pubUtils.taskArgs(arguments);
@@ -1612,7 +1592,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/formatting.js

@@ -110,7 +110,7 @@ function formatValue({value, fm, cc, options}) {
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // Converts array of values into PostgreSQL Array Constructor: array[...], as per PostgreSQL documentation:
-// http://www.postgresql.org/docs/9.6/static/arrays.html
+// https://www.postgresql.org/docs/17/arrays.html
 //
 // Arrays of any depth/dimension are supported.
 //
@@ -888,7 +888,7 @@ const $to = {
             return num < 0 ? `(${s})` : s;
         }
         // Converting NaN/+Infinity/-Infinity according to Postgres documentation:
-        // http://www.postgresql.org/docs/9.6/static/datatype-numeric.html#DATATYPE-FLOAT
+        // https://www.postgresql.org/docs/17/datatype-numeric.html#DATATYPE-FLOAT
         //
         // NOTE: strings for 'NaN'/'+Infinity'/'-Infinity' are not case-sensitive.
         if (num === Number.POSITIVE_INFINITY) {

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/tx-mode.js

@@ -25,16 +25,16 @@ const isolationLevel = {
     /** Isolation level not specified. */
     none: 0,
 
-    /** ISOLATION LEVEL SERIALIZABLE */
+    /** `ISOLATION LEVEL SERIALIZABLE` */
     serializable: 1,
 
-    /** ISOLATION LEVEL REPEATABLE READ */
+    /** `ISOLATION LEVEL REPEATABLE READ` */
     repeatableRead: 2,
 
-    /** ISOLATION LEVEL READ COMMITTED */
+    /** `ISOLATION LEVEL READ COMMITTED` */
     readCommitted: 3
 
-    // From the official documentation: http://www.postgresql.org/docs/9.5/static/sql-set-transaction.html
+    // From the official documentation: https://www.postgresql.org/docs/17/sql-set-transaction.html
     // The SQL standard defines one additional level, READ UNCOMMITTED. In PostgreSQL READ UNCOMMITTED is treated as READ COMMITTED.
     // => skipping `READ UNCOMMITTED`.
 };
@@ -120,7 +120,7 @@ class TransactionMode extends InnerState {
                 accessMode = 'read write';
             }
         }
-        // From the official documentation: http://www.postgresql.org/docs/9.5/static/sql-set-transaction.html
+        // From the official documentation: https://www.postgresql.org/docs/17/sql-set-transaction.html
         // The DEFERRABLE transaction property has no effect unless the transaction is also SERIALIZABLE and READ ONLY
         if (tiLevel === isolationLevel.serializable && readOnly) {
             if (deferrable) {

package/lib/types/prepared-statement.js

@@ -44,7 +44,7 @@ const npm = {
  *
  * @see
  * {@link errors.PreparedStatementError PreparedStatementError},
- * {@link http://www.postgresql.org/docs/9.6/static/sql-prepare.html PostgreSQL Prepared Statements}
+ * {@link https://www.postgresql.org/docs/17/sql-prepare.html PostgreSQL Prepared Statements}
  *
  * @example
  *

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
@@ -169,7 +169,7 @@ function isConnectivityError(err) {
     // Class 08 - Connection Exception (except for 08P01, for protocol violation).
     // Class 57 - Operator Intervention (except for 57014, for cancelled queries).
     //
-    // ERROR CODES: https://www.postgresql.org/docs/9.6/static/errcodes-appendix.html
+    // ERROR CODES: https://www.postgresql.org/docs/17/errcodes-appendix.html
 }
 
 ///////////////////////////////////////////////////////////////

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-promise",
-  "version": "12.1.2",
+  "version": "12.2.0",
   "description": "PostgreSQL interface for Node.js",
   "main": "lib/index.js",
   "typings": "typescript/pg-promise.d.ts",
@@ -50,16 +50,16 @@
     "pg-query-stream": "4.10.3"
   },
   "devDependencies": {
-    "@eslint/js": "9.34.0",
-    "@types/node": "24.3.0",
+    "@eslint/js": "9.36.0",
+    "@types/node": "24.6.1",
     "coveralls": "3.1.1",
     "cspell": "9.2.1",
-    "eslint": "9.34.0",
-    "globals": "16.3.0",
+    "eslint": "9.36.0",
+    "globals": "16.4.0",
     "istanbul": "0.4.5",
     "jasmine-node": "3.0.0",
     "jsdoc": "4.0.4",
     "JSONStream": "1.3.5",
-    "typescript": "5.9.2"
+    "typescript": "5.9.3"
   }
 }