pg-promise 11.5.5 → 11.7.0

package/README.md

@@ -2,8 +2,8 @@ pg-promise
 ==========
 
 [![Build Status](https://github.com/vitaly-t/pg-promise/workflows/ci/badge.svg?branch=master)](https://github.com/vitaly-t/pg-promise/actions?query=workflow%3Aci+branch%3Amaster)
-[![Node Version](https://img.shields.io/badge/nodejs-14%20--%2018-green.svg?logo=node.js&style=flat)](https://nodejs.org)
-[![Postgres Version](https://img.shields.io/badge/postgresql-10%20--%2015-green.svg?logo=postgresql&style=flat)](https://www.postgresql.org)
+[![Node Version](https://img.shields.io/badge/nodejs-14%20--%2020-green.svg?logo=node.js&style=flat)](https://nodejs.org)
+[![Postgres Version](https://img.shields.io/badge/postgresql-10%20--%2016-green.svg?logo=postgresql&style=flat)](https://www.postgresql.org)
 
 ---
 

package/lib/formatting.js

@@ -170,7 +170,7 @@ const formatAs = {
     array({query, array, raw, options}) {
         options = options && typeof options === 'object' ? options : {};
         return query.replace(npm.patterns.multipleValues, name => {
-            const v = formatAs.stripName(name.substr(1), raw);
+            const v = formatAs.stripName(name.substring(1), raw);
             const idx = v.name - 1;
             if (idx >= maxVariable) {
                 throw new RangeError(`Variable $${v.name} exceeds supported maximum of $${maxVariable}`);
@@ -200,7 +200,7 @@ const formatAs = {
         const mod = name.match(npm.patterns.hasValidModifier);
         if (mod) {
             return {
-                name: name.substr(0, mod.index),
+                name: name.substring(0, mod.index),
                 fm: fmMap[mod[0]] | (raw ? fmFlags.raw : 0)
             };
         }

package/lib/helpers/column.js

@@ -266,11 +266,11 @@ function parseColumn(name) {
         const res = {};
         if (name[0] === '?') {
             res.cnd = true;
-            name = name.substr(1);
+            name = name.substring(1);
         }
         const mod = name.match(npm.patterns.hasValidModifier);
         if (mod) {
-            res.name = name.substr(0, mod.index);
+            res.name = name.substring(0, mod.index);
             res.mod = mod[0];
         } else {
             res.name = name;

package/lib/helpers/index.js

@@ -9,7 +9,7 @@
 
 const {Column} = require('./column');
 const {ColumnSet} = require('./column-set');
-const {TableName} = require('./table-name');
+const {TableName, _TN} = require('./table-name');
 const method = require('./methods');
 
 /**
@@ -24,6 +24,9 @@ const method = require('./methods');
  * @property {function} TableName
  * {@link helpers.TableName TableName} class constructor.
  *
+ * @property {function} _TN
+ * {@link helpers._TN _TN} Table-Name template tag function.
+ *
  * @property {function} ColumnSet
  * {@link helpers.ColumnSet ColumnSet} class constructor.
  *
@@ -64,6 +67,7 @@ module.exports = config => {
             return method.sets(data, columns, capSQL());
         },
         TableName,
+        _TN,
         ColumnSet,
         Column
     };

package/lib/helpers/table-name.js

@@ -46,6 +46,7 @@ const npm = {
  * @returns {helpers.TableName}
  *
  * @see
+ * {@link helpers._TN _TN},
  * {@link helpers.TableName#toPostgres toPostgres}
  *
  * @example
@@ -125,4 +126,32 @@ npm.utils.addInspection(TableName, function () {
     return this.toString();
 });
 
-module.exports = {TableName};
+/**
+ *
+ * @interface Table
+ * @description
+ * Structure for any table name/path.
+ *
+ * @property {string} [schema] - schema name, if specified
+ * @property {string} table - table name
+ */
+
+/**
+ * @function helpers._TN
+ * @description
+ * Table-Name template tag function, to convert any `"schema.table"` string
+ * into `{schema, table}` object.
+ *
+ * @example
+ * const {ColumnSet, _TN} = pgp.helpers;
+ *
+ * const cs = new ColumnSet(['id', 'name'], {table: _TN`schema.table`});
+ *
+ * @returns {Table}
+ */
+function _TN(data) {
+    const [schema, table] = data[0].split('.');
+    return table === undefined ? {table: schema} : {schema, table};
+}
+
+module.exports = {TableName, _TN};

package/lib/main.js

@@ -36,7 +36,7 @@ let originalClientConnect;
  * @module pg-promise
  *
  * @description
- * ## pg-promise v11.4
+ * ## pg-promise v11.7
  * All documentation here is for the latest official release only.
  *
  * ### Initialization Options

package/lib/utils/index.js

@@ -162,7 +162,7 @@ function addInspection(type, cb) {
 // This is for detecting when to skip executing ROLLBACK for a failed transaction.
 function isConnectivityError(err) {
     const code = err && typeof err.code === 'string' && err.code;
-    const cls = code && code.substr(0, 2); // Error Class
+    const cls = code && code.substring(0, 2); // Error Class
     // istanbul ignore next (we cannot test-cover all error cases):
     return code === 'ECONNRESET' || (cls === '08' && code !== '08P01') || (cls === '57' && code !== '57014');
     // Code 'ECONNRESET' - Connectivity issue handled by the driver.

package/lib/utils/public.js

@@ -39,7 +39,7 @@ const npm = {
  */
 function camelize(text) {
     text = text.replace(/[-_\s.]+(.)?/g, (_, c) => c ? c.toUpperCase() : '');
-    return text.substr(0, 1).toLowerCase() + text.substr(1);
+    return text.substring(0, 1).toLowerCase() + text.substring(1);
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-promise",
-  "version": "11.5.5",
+  "version": "11.7.0",
   "description": "PostgreSQL interface for Node.js",
   "main": "lib/index.js",
   "typings": "typescript/pg-promise.d.ts",
@@ -42,22 +42,24 @@
   },
   "dependencies": {
     "assert-options": "0.8.1",
-    "pg": "8.11.3",
-    "pg-minify": "1.6.3",
+    "pg": "8.11.5",
+    "pg-minify": "1.6.4",
     "spex": "3.3.0"
   },
   "devDependencies": {
-    "@types/node": "20.5.2",
+    "@eslint/js": "9.3.0",
+    "@types/node": "20.12.12",
     "bluebird": "3.7.2",
     "coveralls": "3.1.1",
-    "cspell": "8.6.0",
-    "eslint": "8.57.0",
+    "cspell": "8.8.3",
+    "eslint": "9.3.0",
+    "globals": "15.3.0",
     "istanbul": "0.4.5",
     "jasmine-node": "3.0.0",
-    "jsdoc": "4.0.2",
+    "jsdoc": "4.0.3",
     "JSONStream": "1.3.5",
-    "pg-query-stream": "4.5.3",
+    "pg-query-stream": "4.5.5",
     "tslint": "6.1.3",
-    "typescript": "5.4.3"
+    "typescript": "5.4.5"
   }
 }

package/typescript/pg-promise.d.ts

@@ -130,8 +130,8 @@ declare namespace pgPromise {
     }
 
     interface ITable {
-        table: string
         schema?: string
+        table: string
     }
 
     interface IPromiseConfig {
@@ -207,7 +207,11 @@ declare namespace pgPromise {
 
         assign(source?: { source?: object, prefix?: string }): string
 
-        assignColumns(options?: { from?: string, to?: string, skip?: string | string[] | ((c: Column<T>) => boolean) }): string
+        assignColumns(options?: {
+            from?: string,
+            to?: string,
+            skip?: string | string[] | ((c: Column<T>) => boolean)
+        }): string
 
         extend<S>(columns: Column<T> | ColumnSet<T> | Array<string | IColumnConfig<T> | Column<T>>): ColumnSet<S>
 
@@ -382,7 +386,10 @@ declare namespace pgPromise {
         multi<T = any>(query: QueryParam, values?: any): XPromise<Array<T[]>>
 
         // API: https://vitaly-t.github.io/pg-promise/Database.html#stream
-        stream(qs: NodeJS.ReadableStream, init: (stream: NodeJS.ReadableStream) => void): XPromise<{ processed: number, duration: number }>
+        stream(qs: NodeJS.ReadableStream, init: (stream: NodeJS.ReadableStream) => void): XPromise<{
+            processed: number,
+            duration: number
+        }>
 
         // API: https://vitaly-t.github.io/pg-promise/Database.html#func
         func<T = any>(funcName: string, values?: any, qrm?: queryResult): XPromise<T>
@@ -410,7 +417,10 @@ declare namespace pgPromise {
 
         taskIf<T = any>(tag: string | number, cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
 
-        taskIf<T = any>(options: { tag?: any, cnd?: boolean | ((t: ITask<Ext> & Ext) => boolean) }, cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
+        taskIf<T = any>(options: {
+            tag?: any,
+            cnd?: boolean | ((t: ITask<Ext> & Ext) => boolean)
+        }, cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
 
         // Transactions;
         // API: https://vitaly-t.github.io/pg-promise/Database.html#tx
@@ -418,7 +428,10 @@ declare namespace pgPromise {
 
         tx<T = any>(tag: string | number, cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
 
-        tx<T = any>(options: { tag?: any, mode?: _txMode.TransactionMode | null }, cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
+        tx<T = any>(options: {
+            tag?: any,
+            mode?: _txMode.TransactionMode | null
+        }, cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
 
         // Conditional Transactions;
         // API: https://vitaly-t.github.io/pg-promise/Database.html#txIf
@@ -426,7 +439,12 @@ declare namespace pgPromise {
 
         txIf<T = any>(tag: string | number, cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
 
-        txIf<T = any>(options: { tag?: any, mode?: _txMode.TransactionMode | null, reusable?: boolean | ((t: ITask<Ext> & Ext) => boolean), cnd?: boolean | ((t: ITask<Ext> & Ext) => boolean) }, cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
+        txIf<T = any>(options: {
+            tag?: any,
+            mode?: _txMode.TransactionMode | null,
+            reusable?: boolean | ((t: ITask<Ext> & Ext) => boolean),
+            cnd?: boolean | ((t: ITask<Ext> & Ext) => boolean)
+        }, cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
     }
 
     // Database object in connected state;
@@ -656,7 +674,10 @@ declare namespace pgPromise {
 
         camelizeVar(text: string): string
 
-        enumSql(dir: string, options?: { recursive?: boolean, ignoreErrors?: boolean }, cb?: (file: string, name: string, path: string) => any): any
+        enumSql(dir: string, options?: {
+            recursive?: boolean,
+            ignoreErrors?: boolean
+        }, cb?: (file: string, name: string, path: string) => any): any
 
         taskArgs<T = {}>(args: IArguments): ITaskArguments<T>
     }
@@ -665,11 +686,19 @@ declare namespace pgPromise {
     // API: https://vitaly-t.github.io/pg-promise/helpers.html
     interface IHelpers {
 
-        concat(queries: Array<string | QueryFile | { query: string | QueryFile, values?: any, options?: IFormattingOptions }>): string
+        concat(queries: Array<string | QueryFile | {
+            query: string | QueryFile,
+            values?: any,
+            options?: IFormattingOptions
+        }>): string
 
         insert(data: object | object[], columns?: QueryColumns<any> | null, table?: string | ITable | TableName): string
 
-        update(data: object | object[], columns?: QueryColumns<any> | null, table?: string | ITable | TableName, options?: { tableAlias?: string, valueAlias?: string, emptyUpdate?: any }): any
+        update(data: object | object[], columns?: QueryColumns<any> | null, table?: string | ITable | TableName, options?: {
+            tableAlias?: string,
+            valueAlias?: string,
+            emptyUpdate?: any
+        }): any
 
         values(data: object | object[], columns?: QueryColumns<any> | null): string
 
@@ -678,6 +707,8 @@ declare namespace pgPromise {
         Column: typeof Column
         ColumnSet: typeof ColumnSet
         TableName: typeof TableName
+
+        _TN: (data: TemplateStringsArray) => ITable
     }
 
     interface IGenericPromise {