pg-promise 11.7.8 → 11.9.0

package/lib/helpers/table-name.js

@@ -168,9 +168,8 @@ npm.utils.addInspection(TableName, function () {
  * @see {@link helpers.TableName TableName}, {@link external:TemplateStringsArray TemplateStringsArray}
  */
 function _TN(path, ...args) {
-    if (Array.isArray(path) && path.raw) {
-        const v = i => i < args.length ? args[i] ?? '' : '';
-        path = path.reduce((a, c, i) => a + c + v(i), '');
+    if (Array.isArray(path)) {
+        path = path.reduce((a, c, i) => a + c + (args[i] ?? ''), '');
     } // else 'path' is a string
     const [schema, table] = path.split('.');
     if (table === undefined) {

package/lib/main.js

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

package/lib/types/parameterized-query.js

@@ -36,6 +36,7 @@ const npm = {
  * @param {array} [options.values] - See property {@link ParameterizedQuery#values values}.
  * @param {boolean} [options.binary] - See property {@link ParameterizedQuery#binary binary}.
  * @param {string} [options.rowMode] - See property {@link ParameterizedQuery#rowMode rowMode}.
+ * @param {ITypes} [options.types] - See property {@link ParameterizedQuery#types types}.
  *
  * @returns {ParameterizedQuery}
  *
@@ -91,7 +92,7 @@ class ParameterizedQuery extends ServerFormatting {
                 text: options
             };
         } else {
-            options = assert(options, ['text', 'values', 'binary', 'rowMode']);
+            options = assert(options, ['text', 'values', 'binary', 'rowMode', 'types']);
         }
         super(options);
     }
@@ -148,6 +149,10 @@ ParameterizedQuery.prototype.parse = function () {
         _i.target.rowMode = options.rowMode;
     }
 
+    if (options.types !== undefined) {
+        _i.target.types = options.types;
+    }
+
     if (errors.length) {
         return _i.currentError = new ParameterizedQueryError(errors[0], _i.target);
     }
@@ -238,6 +243,14 @@ module.exports = {ParameterizedQuery};
  *  - `array` will make all data rows arrive as arrays of values. By default, rows arrive as objects.
  */
 
+/**
+ * @name ParameterizedQuery#types
+ * @type {ITypes}
+ * @default undefined
+ * @description
+ * Custom type parsers just for this query result.
+ */
+
 /**
  * @name ParameterizedQuery#error
  * @type {errors.ParameterizedQueryError}

package/lib/types/prepared-statement.js

@@ -38,6 +38,7 @@ const npm = {
  * @param {boolean} [options.binary] - See property {@link PreparedStatement#binary binary}.
  * @param {string} [options.rowMode] - See property {@link PreparedStatement#rowMode rowMode}.
  * @param {number} [options.rows] - See property {@link PreparedStatement#rows rows}.
+ * @param {ITypes} [options.types] - See property {@link PreparedStatement#types types}.
  *
  * @returns {PreparedStatement}
  *
@@ -89,7 +90,7 @@ const npm = {
  */
 class PreparedStatement extends ServerFormatting {
     constructor(options) {
-        options = assert(options, ['name', 'text', 'values', 'binary', 'rowMode', 'rows']);
+        options = assert(options, ['name', 'text', 'values', 'binary', 'rowMode', 'rows', 'types']);
         super(options);
     }
 
@@ -192,6 +193,10 @@ PreparedStatement.prototype.parse = function () {
         _i.target.rows = options.rows;
     }
 
+    if (options.types !== undefined) {
+        _i.target.types = options.types;
+    }
+
     if (errors.length) {
         return _i.currentError = new PreparedStatementError(errors[0], _i.target);
     }
@@ -289,6 +294,14 @@ module.exports = {PreparedStatement};
  *  - `array` will make all data rows arrive as arrays of values. By default, rows arrive as objects.
  */
 
+/**
+ * @name PreparedStatement#types
+ * @type {ITypes}
+ * @default undefined
+ * @description
+ * Custom type parsers just for this query result.
+ */
+
 /**
  * @name PreparedStatement#error
  * @type {errors.PreparedStatementError}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pg-promise",
-  "version": "11.7.8",
+  "version": "11.9.0",
   "description": "PostgreSQL interface for Node.js",
   "main": "lib/index.js",
   "typings": "typescript/pg-promise.d.ts",
@@ -42,24 +42,24 @@
   },
   "dependencies": {
     "assert-options": "0.8.1",
-    "pg": "8.11.5",
+    "pg": "8.12.0",
     "pg-minify": "1.6.4",
     "spex": "3.3.0"
   },
   "devDependencies": {
-    "@eslint/js": "9.3.0",
-    "@types/node": "20.12.12",
+    "@eslint/js": "9.6.0",
+    "@types/node": "20.14.9",
     "bluebird": "3.7.2",
     "coveralls": "3.1.1",
-    "cspell": "8.8.3",
-    "eslint": "9.3.0",
-    "globals": "15.3.0",
+    "cspell": "8.10.0",
+    "eslint": "9.6.0",
+    "globals": "15.8.0",
     "istanbul": "0.4.5",
     "jasmine-node": "3.0.0",
     "jsdoc": "4.0.3",
     "JSONStream": "1.3.5",
-    "pg-query-stream": "4.5.5",
+    "pg-query-stream": "4.6.0",
     "tslint": "6.1.3",
-    "typescript": "5.4.5"
+    "typescript": "5.5.3"
   }
 }

package/typescript/pg-promise.d.ts

@@ -15,6 +15,7 @@
 // Follow the links below:
 // https://stackoverflow.com/questions/36593087/using-a-custom-promise-as-a-generic-type
 // https://github.com/Microsoft/TypeScript/issues/1213
+
 type XPromise<T> = Promise<T>;
 
 import * as pg from './pg-subset';
@@ -79,6 +80,7 @@ declare namespace pgPromise {
         binary?: boolean
         rowMode?: 'array' | null | void
         rows?: number
+        types?: pg.ITypes
     }
 
     interface IParameterizedQuery {
@@ -86,6 +88,7 @@ declare namespace pgPromise {
         values?: any[]
         binary?: boolean
         rowMode?: void | 'array'
+        types?: pg.ITypes;
     }
 
     interface IPreparedParsed {
@@ -248,6 +251,7 @@ declare namespace pgPromise {
         binary: boolean;
         rowMode: void | 'array';
         rows: number;
+        types: pg.ITypes;
 
         parse(): IPreparedParsed | errors.PreparedStatementError
 
@@ -267,6 +271,7 @@ declare namespace pgPromise {
         // advanced properties:
         binary: boolean;
         rowMode: void | 'array';
+        types: pg.ITypes;
 
         parse(): IParameterizedParsed | errors.ParameterizedQueryError
 
@@ -349,6 +354,16 @@ declare namespace pgPromise {
         readonly ctx: ITaskContext
     }
 
+    interface ITaskIfOptions<Ext = {}> {
+        cnd?: boolean | ((t: ITask<Ext> & Ext) => boolean)
+        tag?: any
+    }
+
+    interface ITxIfOptions<Ext = {}> extends ITaskIfOptions<Ext> {
+        mode?: _txMode.TransactionMode | null
+        reusable?: boolean | ((t: ITask<Ext> & Ext) => boolean)
+    }
+
     // Base database protocol
     // API: https://vitaly-t.github.io/pg-promise/Database.html
     interface IBaseProtocol<Ext> {
@@ -405,46 +420,38 @@ declare namespace pgPromise {
 
         // Tasks;
         // API: https://vitaly-t.github.io/pg-promise/Database.html#task
-        task<T = any>(cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
+        task<T>(cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
 
-        task<T = any>(tag: string | number, cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
+        task<T>(tag: string | number, cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
 
-        task<T = any>(options: { tag?: any }, cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
+        task<T>(options: { tag?: any }, cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
 
         // Conditional Tasks;
         // API: https://vitaly-t.github.io/pg-promise/Database.html#taskIf
-        taskIf<T = any>(cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
+        taskIf<T>(cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
 
-        taskIf<T = any>(tag: string | number, cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
+        taskIf<T>(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>(options: ITaskIfOptions<Ext>, cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
 
         // Transactions;
         // API: https://vitaly-t.github.io/pg-promise/Database.html#tx
-        tx<T = any>(cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
+        tx<T>(cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
 
-        tx<T = any>(tag: string | number, cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
+        tx<T>(tag: string | number, cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
 
-        tx<T = any>(options: {
+        tx<T>(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
-        txIf<T = any>(cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
+        txIf<T>(cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
 
-        txIf<T = any>(tag: string | number, cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
+        txIf<T>(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>(options: ITxIfOptions<Ext>, cb: (t: ITask<Ext> & Ext) => T | XPromise<T>): XPromise<T>
     }
 
     // Database object in connected state;
@@ -709,7 +716,8 @@ declare namespace pgPromise {
         TableName: typeof TableName
 
         _TN(path: TemplateStringsArray, ...args: Array<any>): ITable
-        _TN(path: string) :ITable
+
+        _TN(path: string): ITable
     }
 
     interface IGenericPromise {