postgrejs 2.16.0 → 2.17.0

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v2.17.0
+[2024-08-11]
+
+### Changes
+
+* Rollback to ES2020 ([`279aed6`](https://github.com/panates/postgrejs/commit/279aed60b05bf7785f3785df2d43ab8c194abab2))
+* Rollback to ES2020 ([`1c0b78e`](https://github.com/panates/postgrejs/commit/1c0b78e6c0dd963f0e120031b3a5c2fe7a7b621c))
+
 # v2.16.0
 [2024-08-09]
 

package/esm/connection/bind-param.js

@@ -1,10 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BindParam = void 0;
-class BindParam {
+export class BindParam {
     constructor(oid, value) {
         this.oid = oid;
         this.value = value;
     }
 }
-exports.BindParam = BindParam;

package/esm/connection/connection.js

@@ -1,25 +1,22 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Connection = void 0;
-const constants_js_1 = require("../constants.js");
-const data_type_map_js_1 = require("../data-type-map.js");
-const safe_event_emitter_js_1 = require("../safe-event-emitter.js");
-const bind_param_js_1 = require("./bind-param.js");
-const intl_connection_js_1 = require("./intl-connection.js");
-const prepared_statement_js_1 = require("./prepared-statement.js");
-class Connection extends safe_event_emitter_js_1.SafeEventEmitter {
+import { ConnectionState } from '../constants.js';
+import { GlobalTypeMap } from '../data-type-map.js';
+import { SafeEventEmitter } from '../safe-event-emitter.js';
+import { BindParam } from './bind-param.js';
+import { IntlConnection } from './intl-connection.js';
+import { PreparedStatement } from './prepared-statement.js';
+export class Connection extends SafeEventEmitter {
     constructor(arg0, arg1) {
         super();
-        this._notificationListeners = new safe_event_emitter_js_1.SafeEventEmitter();
+        this._notificationListeners = new SafeEventEmitter();
         this._closing = false;
         if (arg0 && typeof arg0 === 'object' && typeof arg0.acquire === 'function') {
-            if (!(arg1 instanceof intl_connection_js_1.IntlConnection))
+            if (!(arg1 instanceof IntlConnection))
                 throw new TypeError('Invalid argument');
             this._pool = arg0;
             this._intlCon = arg1;
         }
         else {
-            this._intlCon = new intl_connection_js_1.IntlConnection(arg0);
+            this._intlCon = new IntlConnection(arg0);
         }
         this._intlCon.on('ready', (...args) => this.emit('ready', ...args));
         this._intlCon.on('error', (...args) => this.emit('error', ...args));
@@ -70,7 +67,7 @@ class Connection extends safe_event_emitter_js_1.SafeEventEmitter {
      */
     async connect() {
         await this._captureErrorStack(this._intlCon.connect());
-        if (this.state === constants_js_1.ConnectionState.READY)
+        if (this.state === ConnectionState.READY)
             this._closing = false;
     }
     /**
@@ -83,7 +80,7 @@ class Connection extends safe_event_emitter_js_1.SafeEventEmitter {
     async close(terminateWait) {
         this._notificationListeners.removeAllListeners();
         this._intlCon.statementQueue.clearQueue();
-        if (this.state === constants_js_1.ConnectionState.CLOSED || this._closing)
+        if (this.state === ConnectionState.CLOSED || this._closing)
             return;
         /* istanbul ignore next */
         if (this.listenerCount('debug')) {
@@ -148,13 +145,13 @@ class Connection extends safe_event_emitter_js_1.SafeEventEmitter {
                 sql,
             });
         }
-        const typeMap = options?.typeMap || data_type_map_js_1.GlobalTypeMap;
-        const paramTypes = options?.params?.map(prm => prm instanceof bind_param_js_1.BindParam ? prm.oid : typeMap.determine(prm));
+        const typeMap = options?.typeMap || GlobalTypeMap;
+        const paramTypes = options?.params?.map(prm => prm instanceof BindParam ? prm.oid : typeMap.determine(prm));
         const statement = await this.prepare(sql, { paramTypes, typeMap }).catch((e) => {
             throw this._handleError(e, sql);
         });
         try {
-            const params = options?.params?.map(prm => (prm instanceof bind_param_js_1.BindParam ? prm.value : prm));
+            const params = options?.params?.map(prm => (prm instanceof BindParam ? prm.value : prm));
             return await this._captureErrorStack(statement.execute({ ...options, params }));
         }
         finally {
@@ -176,7 +173,7 @@ class Connection extends safe_event_emitter_js_1.SafeEventEmitter {
                 sql,
             });
         }
-        return await this._captureErrorStack(prepared_statement_js_1.PreparedStatement.prepare(this, sql, options));
+        return await this._captureErrorStack(PreparedStatement.prepare(this, sql, options));
     }
     /**
      * Starts a transaction
@@ -281,4 +278,3 @@ class Connection extends safe_event_emitter_js_1.SafeEventEmitter {
         return this.close();
     }
 }
-exports.Connection = Connection;

package/esm/connection/cursor.js

@@ -1,17 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Cursor = void 0;
-const tslib_1 = require("tslib");
-const doublylinked_1 = tslib_1.__importDefault(require("doublylinked"));
-const power_tasks_1 = require("power-tasks");
-const safe_event_emitter_js_1 = require("../safe-event-emitter.js");
-const convert_row_to_object_js_1 = require("../util/convert-row-to-object.js");
-const parse_row_js_1 = require("../util/parse-row.js");
-class Cursor extends safe_event_emitter_js_1.SafeEventEmitter {
+import DoublyLinked from 'doublylinked';
+import { TaskQueue } from 'power-tasks';
+import { SafeEventEmitter } from '../safe-event-emitter.js';
+import { convertRowToObject } from '../util/convert-row-to-object.js';
+import { parseRow } from '../util/parse-row.js';
+export class Cursor extends SafeEventEmitter {
     constructor(statement, portal, fields, parsers, queryOptions) {
         super();
-        this._taskQueue = new power_tasks_1.TaskQueue({ concurrency: 1 });
-        this._rows = new doublylinked_1.default();
+        this._taskQueue = new TaskQueue({ concurrency: 1 });
+        this._rows = new DoublyLinked();
         this._closed = false;
         this._statement = statement;
         this._portal = portal;
@@ -70,9 +66,9 @@ class Cursor extends safe_event_emitter_js_1.SafeEventEmitter {
                     const rows = r.rows;
                     for (let i = 0; i < rows.length; i++) {
                         const row = rows[i];
-                        (0, parse_row_js_1.parseRow)(this._parsers, row, this._queryOptions);
+                        parseRow(this._parsers, row, this._queryOptions);
                         if (objectRows)
-                            rows[i] = (0, convert_row_to_object_js_1.convertRowToObject)(fields, row);
+                            rows[i] = convertRowToObject(fields, row);
                     }
                 }
                 this._rows.push(...r.rows);
@@ -88,4 +84,3 @@ class Cursor extends safe_event_emitter_js_1.SafeEventEmitter {
         return this.close();
     }
 }
-exports.Cursor = Cursor;

package/esm/connection/intl-connection.js

@@ -1,29 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IntlConnection = void 0;
-exports.getIntlConnection = getIntlConnection;
-const power_tasks_1 = require("power-tasks");
-const putil_varhelpers_1 = require("putil-varhelpers");
-const constants_js_1 = require("../constants.js");
-const data_type_map_js_1 = require("../data-type-map.js");
-const pg_socket_js_1 = require("../protocol/pg-socket.js");
-const protocol_js_1 = require("../protocol/protocol.js");
-const safe_event_emitter_js_1 = require("../safe-event-emitter.js");
-const connection_config_js_1 = require("../util/connection-config.js");
-const convert_row_to_object_js_1 = require("../util/convert-row-to-object.js");
-const escape_literal_js_1 = require("../util/escape-literal.js");
-const get_parsers_js_1 = require("../util/get-parsers.js");
-const parse_row_js_1 = require("../util/parse-row.js");
-const wrap_row_description_js_1 = require("../util/wrap-row-description.js");
-const DataFormat = protocol_js_1.Protocol.DataFormat;
-class IntlConnection extends safe_event_emitter_js_1.SafeEventEmitter {
+import { TaskQueue } from 'power-tasks';
+import { coerceToBoolean } from 'putil-varhelpers';
+import { ConnectionState } from '../constants.js';
+import { GlobalTypeMap } from '../data-type-map.js';
+import { PgSocket } from '../protocol/pg-socket.js';
+import { Protocol } from '../protocol/protocol.js';
+import { SafeEventEmitter } from '../safe-event-emitter.js';
+import { getConnectionConfig } from '../util/connection-config.js';
+import { convertRowToObject } from '../util/convert-row-to-object.js';
+import { escapeLiteral } from '../util/escape-literal.js';
+import { getParsers } from '../util/get-parsers.js';
+import { parseRow } from '../util/parse-row.js';
+import { wrapRowDescription } from '../util/wrap-row-description.js';
+const DataFormat = Protocol.DataFormat;
+export class IntlConnection extends SafeEventEmitter {
     constructor(config) {
         super();
         this._refCount = 0;
         this.transactionStatus = 'I';
-        this.statementQueue = new power_tasks_1.TaskQueue({ concurrency: 1 });
-        this._config = Object.freeze((0, connection_config_js_1.getConnectionConfig)(config));
-        this.socket = new pg_socket_js_1.PgSocket(this._config);
+        this.statementQueue = new TaskQueue({ concurrency: 1 });
+        this._config = Object.freeze(getConnectionConfig(config));
+        this.socket = new PgSocket(this._config);
         this.socket.on('error', err => this._onError(err));
         this.socket.on('close', () => this.emit('close'));
         this.socket.on('notification', payload => this.emit('notification', payload));
@@ -52,7 +48,7 @@ class IntlConnection extends safe_event_emitter_js_1.SafeEventEmitter {
         return this.socket.sessionParameters;
     }
     async connect() {
-        if (this.socket.state === constants_js_1.ConnectionState.READY)
+        if (this.socket.state === ConnectionState.READY)
             return;
         await new Promise((resolve, reject) => {
             const handleConnectError = err => reject(err);
@@ -65,19 +61,19 @@ class IntlConnection extends safe_event_emitter_js_1.SafeEventEmitter {
         });
         let startupCommand = '';
         if (this.config.schema)
-            startupCommand += 'SET search_path = ' + (0, escape_literal_js_1.escapeLiteral)(this.config.schema) + ';';
+            startupCommand += 'SET search_path = ' + escapeLiteral(this.config.schema) + ';';
         if (this.config.timezone)
-            startupCommand += 'SET timezone TO ' + (0, escape_literal_js_1.escapeLiteral)(this.config.timezone) + ';';
+            startupCommand += 'SET timezone TO ' + escapeLiteral(this.config.timezone) + ';';
         if (startupCommand)
             await this.execute(startupCommand, { autoCommit: true });
         this.emit('ready');
     }
     async close() {
-        if (this.state === constants_js_1.ConnectionState.CLOSED)
+        if (this.state === ConnectionState.CLOSED)
             return;
         this.statementQueue.clearQueue();
         return new Promise(resolve => {
-            if (this.socket.state === constants_js_1.ConnectionState.CLOSED)
+            if (this.socket.state === ConnectionState.CLOSED)
                 return;
             this.socket.once('close', resolve);
             this.socket.sendTerminateMessage(() => {
@@ -106,7 +102,7 @@ class IntlConnection extends safe_event_emitter_js_1.SafeEventEmitter {
             const rollbackOnError = !transactionCommand &&
                 (options?.rollbackOnError != null
                     ? options.rollbackOnError
-                    : (0, putil_varhelpers_1.coerceToBoolean)(this.config.rollbackOnError, true));
+                    : coerceToBoolean(this.config.rollbackOnError, true));
             if (this.inTransaction && rollbackOnError)
                 await this._execute('SAVEPOINT ' + this._onErrorSavePoint);
             try {
@@ -161,9 +157,9 @@ class IntlConnection extends safe_event_emitter_js_1.SafeEventEmitter {
         return !this._refCount;
     }
     assertConnected() {
-        if (this.state === constants_js_1.ConnectionState.CLOSING)
+        if (this.state === ConnectionState.CLOSING)
             throw new Error('Connection is closing');
-        if (this.state === constants_js_1.ConnectionState.CLOSED)
+        if (this.state === ConnectionState.CLOSED)
             throw new Error('Connection closed');
     }
     async _execute(sql, options, cb) {
@@ -181,33 +177,33 @@ class IntlConnection extends safe_event_emitter_js_1.SafeEventEmitter {
             let parsers;
             let current = { command: undefined };
             let fields;
-            const typeMap = opts.typeMap || data_type_map_js_1.GlobalTypeMap;
+            const typeMap = opts.typeMap || GlobalTypeMap;
             return await this.socket.capture(async (code, msg, done) => {
                 switch (code) {
-                    case protocol_js_1.Protocol.BackendMessageCode.NoticeResponse:
-                    case protocol_js_1.Protocol.BackendMessageCode.CopyInResponse:
-                    case protocol_js_1.Protocol.BackendMessageCode.CopyOutResponse:
-                    case protocol_js_1.Protocol.BackendMessageCode.EmptyQueryResponse:
+                    case Protocol.BackendMessageCode.NoticeResponse:
+                    case Protocol.BackendMessageCode.CopyInResponse:
+                    case Protocol.BackendMessageCode.CopyOutResponse:
+                    case Protocol.BackendMessageCode.EmptyQueryResponse:
                         break;
-                    case protocol_js_1.Protocol.BackendMessageCode.RowDescription:
+                    case Protocol.BackendMessageCode.RowDescription:
                         fields = msg.fields;
-                        parsers = (0, get_parsers_js_1.getParsers)(typeMap, fields);
-                        current.fields = (0, wrap_row_description_js_1.wrapRowDescription)(typeMap, fields, DataFormat.text);
+                        parsers = getParsers(typeMap, fields);
+                        current.fields = wrapRowDescription(typeMap, fields, DataFormat.text);
                         current.rows = [];
                         break;
-                    case protocol_js_1.Protocol.BackendMessageCode.DataRow:
+                    case Protocol.BackendMessageCode.DataRow:
                         {
                             let row = msg.columns.map((x) => x.toString('utf8'));
-                            (0, parse_row_js_1.parseRow)(parsers, row, opts);
+                            parseRow(parsers, row, opts);
                             if (opts.objectRows && current.fields)
-                                row = (0, convert_row_to_object_js_1.convertRowToObject)(current.fields, row);
+                                row = convertRowToObject(current.fields, row);
                             if (cb)
                                 cb('row', row);
                             current.rows = current.rows || [];
                             current.rows.push(row);
                         }
                         break;
-                    case protocol_js_1.Protocol.BackendMessageCode.CommandComplete:
+                    case Protocol.BackendMessageCode.CommandComplete:
                         // Ignore BEGIN command that we added to sql
                         current.command = msg.command;
                         if (current.command === 'DELETE' || current.command === 'INSERT' || current.command === 'UPDATE') {
@@ -222,7 +218,7 @@ class IntlConnection extends safe_event_emitter_js_1.SafeEventEmitter {
                         current = { command: undefined };
                         currentStart = Date.now();
                         break;
-                    case protocol_js_1.Protocol.BackendMessageCode.ReadyForQuery:
+                    case Protocol.BackendMessageCode.ReadyForQuery:
                         this.transactionStatus = msg.status;
                         result.totalTime = Date.now() - startTime;
                         // Ignore COMMIT command that we added to sql
@@ -239,12 +235,11 @@ class IntlConnection extends safe_event_emitter_js_1.SafeEventEmitter {
         }
     }
     _onError(err) {
-        if (this.socket.state !== constants_js_1.ConnectionState.READY)
+        if (this.socket.state !== ConnectionState.READY)
             return;
         this.emit('error', err);
     }
 }
-exports.IntlConnection = IntlConnection;
-function getIntlConnection(connection) {
+export function getIntlConnection(connection) {
     return connection._intlCon;
 }

package/esm/connection/pool.js

@@ -1,30 +1,27 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Pool = void 0;
-const lightning_pool_1 = require("lightning-pool");
-const putil_varhelpers_1 = require("putil-varhelpers");
-const constants_js_1 = require("../constants.js");
-const safe_event_emitter_js_1 = require("../safe-event-emitter.js");
-const connection_config_js_1 = require("../util/connection-config.js");
-const connection_js_1 = require("./connection.js");
-const intl_connection_js_1 = require("./intl-connection.js");
-class Pool extends safe_event_emitter_js_1.SafeEventEmitter {
+import { Pool as LightningPool } from 'lightning-pool';
+import { coerceToBoolean, coerceToInt } from 'putil-varhelpers';
+import { ConnectionState } from '../constants.js';
+import { SafeEventEmitter } from '../safe-event-emitter.js';
+import { getConnectionConfig } from '../util/connection-config.js';
+import { Connection } from './connection.js';
+import { getIntlConnection, IntlConnection } from './intl-connection.js';
+export class Pool extends SafeEventEmitter {
     constructor(config) {
         super();
-        this._notificationListeners = new safe_event_emitter_js_1.SafeEventEmitter();
-        const cfg = (0, connection_config_js_1.getConnectionConfig)(config);
+        this._notificationListeners = new SafeEventEmitter();
+        const cfg = getConnectionConfig(config);
         this.config = Object.freeze(cfg);
         const poolOptions = {};
-        poolOptions.acquireMaxRetries = (0, putil_varhelpers_1.coerceToInt)(cfg.acquireMaxRetries, 0);
-        poolOptions.acquireRetryWait = (0, putil_varhelpers_1.coerceToInt)(cfg.acquireRetryWait, 2000);
-        poolOptions.acquireTimeoutMillis = (0, putil_varhelpers_1.coerceToInt)(cfg.acquireTimeoutMillis, 0);
-        poolOptions.idleTimeoutMillis = (0, putil_varhelpers_1.coerceToInt)(cfg.idleTimeoutMillis, 30000);
-        poolOptions.max = (0, putil_varhelpers_1.coerceToInt)(cfg.max, 10);
-        poolOptions.maxQueue = (0, putil_varhelpers_1.coerceToInt)(cfg.maxQueue, 1000);
-        poolOptions.max = (0, putil_varhelpers_1.coerceToInt)(cfg.max, 10);
-        poolOptions.min = (0, putil_varhelpers_1.coerceToInt)(cfg.min, 0);
-        poolOptions.minIdle = (0, putil_varhelpers_1.coerceToInt)(cfg.minIdle, 0);
-        poolOptions.validation = (0, putil_varhelpers_1.coerceToBoolean)(cfg.validation, false);
+        poolOptions.acquireMaxRetries = coerceToInt(cfg.acquireMaxRetries, 0);
+        poolOptions.acquireRetryWait = coerceToInt(cfg.acquireRetryWait, 2000);
+        poolOptions.acquireTimeoutMillis = coerceToInt(cfg.acquireTimeoutMillis, 0);
+        poolOptions.idleTimeoutMillis = coerceToInt(cfg.idleTimeoutMillis, 30000);
+        poolOptions.max = coerceToInt(cfg.max, 10);
+        poolOptions.maxQueue = coerceToInt(cfg.maxQueue, 1000);
+        poolOptions.max = coerceToInt(cfg.max, 10);
+        poolOptions.min = coerceToInt(cfg.min, 0);
+        poolOptions.minIdle = coerceToInt(cfg.minIdle, 0);
+        poolOptions.validation = coerceToBoolean(cfg.validation, false);
         const poolFactory = {
             create: async () => {
                 /* istanbul ignore next */
@@ -35,7 +32,7 @@ class Pool extends safe_event_emitter_js_1.SafeEventEmitter {
                         message: `new connection creating`,
                     });
                 }
-                const intlCon = new intl_connection_js_1.IntlConnection(cfg);
+                const intlCon = new IntlConnection(cfg);
                 await intlCon.connect();
                 intlCon.on('close', () => this._pool.destroy(intlCon));
                 /* istanbul ignore next */
@@ -69,7 +66,7 @@ class Pool extends safe_event_emitter_js_1.SafeEventEmitter {
                     });
                 }
                 try {
-                    if (intlCon.state === constants_js_1.ConnectionState.READY) {
+                    if (intlCon.state === ConnectionState.READY) {
                         await intlCon.execute('ROLLBACK;UNLISTEN *');
                     }
                 }
@@ -88,12 +85,12 @@ class Pool extends safe_event_emitter_js_1.SafeEventEmitter {
                         message: `[${intlCon.processID}] connection validate`,
                     });
                 }
-                if (intlCon.state !== constants_js_1.ConnectionState.READY)
+                if (intlCon.state !== ConnectionState.READY)
                     throw new Error('Connection is not active');
                 await intlCon.execute('select 1;');
             },
         };
-        this._pool = new lightning_pool_1.Pool(poolFactory, poolOptions);
+        this._pool = new LightningPool(poolFactory, poolOptions);
         this._pool.on('return', (...args) => this.emit('release', ...args));
         this._pool.on('error', (...args) => this.emit('error', ...args));
         this._pool.on('acquire', (...args) => this.emit('acquire', ...args));
@@ -131,7 +128,7 @@ class Pool extends safe_event_emitter_js_1.SafeEventEmitter {
                 message: `[${intlCon.processID}] acquired`,
             });
         }
-        const connection = new connection_js_1.Connection(this, intlCon);
+        const connection = new Connection(this, intlCon);
         /* istanbul ignore next */
         if (this.listenerCount('debug'))
             connection.on('debug', (...args) => this.emit('debug', ...args));
@@ -173,11 +170,11 @@ class Pool extends safe_event_emitter_js_1.SafeEventEmitter {
     async prepare(sql, options) {
         const connection = await this.acquire();
         const statement = await connection.prepare(sql, options);
-        statement.once('close', () => this._pool.release((0, intl_connection_js_1.getIntlConnection)(connection)));
+        statement.once('close', () => this._pool.release(getIntlConnection(connection)));
         return statement;
     }
     release(connection) {
-        return this._pool.releaseAsync((0, intl_connection_js_1.getIntlConnection)(connection));
+        return this._pool.releaseAsync(getIntlConnection(connection));
     }
     async listen(channel, callback) {
         if (!/^[A-Z]\w+$/i.test(channel))
@@ -206,7 +203,7 @@ class Pool extends safe_event_emitter_js_1.SafeEventEmitter {
     async _initNotificationConnection() {
         if (this._notificationConnection)
             return;
-        const conn = (this._notificationConnection = new connection_js_1.Connection(this.config));
+        const conn = (this._notificationConnection = new Connection(this.config));
         // Reconnect on connection lost
         conn.on('close', () => reConnect());
         const registerEvents = async () => {
@@ -229,4 +226,3 @@ class Pool extends safe_event_emitter_js_1.SafeEventEmitter {
         await registerEvents();
     }
 }
-exports.Pool = Pool;

package/esm/connection/portal.js

@@ -1,13 +1,10 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Portal = void 0;
-const constants_js_1 = require("../constants.js");
-const data_type_map_js_1 = require("../data-type-map.js");
-const protocol_js_1 = require("../protocol/protocol.js");
-const intl_connection_js_1 = require("./intl-connection.js");
-class Portal {
+import { DEFAULT_COLUMN_FORMAT } from '../constants.js';
+import { GlobalTypeMap } from '../data-type-map.js';
+import { Protocol } from '../protocol/protocol.js';
+import { getIntlConnection } from './intl-connection.js';
+export class Portal {
     constructor(statement, name) {
-        this._columnFormat = constants_js_1.DEFAULT_COLUMN_FORMAT;
+        this._columnFormat = DEFAULT_COLUMN_FORMAT;
         this._statement = statement;
         this._name = name;
     }
@@ -18,13 +15,13 @@ class Portal {
         return this._name;
     }
     async bind(params, queryOptions) {
-        const intoCon = (0, intl_connection_js_1.getIntlConnection)(this.connection);
+        const intoCon = getIntlConnection(this.connection);
         intoCon.ref();
         try {
             const socket = intoCon.socket;
-            this._columnFormat = queryOptions.columnFormat != null ? queryOptions.columnFormat : protocol_js_1.Protocol.DataFormat.binary;
+            this._columnFormat = queryOptions.columnFormat != null ? queryOptions.columnFormat : Protocol.DataFormat.binary;
             socket.sendBindMessage({
-                typeMap: queryOptions.typeMap || data_type_map_js_1.GlobalTypeMap,
+                typeMap: queryOptions.typeMap || GlobalTypeMap,
                 statement: this._statement.name,
                 portal: this.name,
                 paramTypes: this._statement.paramTypes,
@@ -34,10 +31,10 @@ class Portal {
             socket.sendFlushMessage();
             return await socket.capture(async (code, msg, done) => {
                 switch (code) {
-                    case protocol_js_1.Protocol.BackendMessageCode.BindComplete:
+                    case Protocol.BackendMessageCode.BindComplete:
                         done();
                         break;
-                    case protocol_js_1.Protocol.BackendMessageCode.NoticeResponse:
+                    case Protocol.BackendMessageCode.NoticeResponse:
                         break;
                     default:
                         done(new Error(`Server returned unexpected response message (${String.fromCharCode(code)})`));
@@ -49,7 +46,7 @@ class Portal {
         }
     }
     async retrieveFields() {
-        const intoCon = (0, intl_connection_js_1.getIntlConnection)(this.connection);
+        const intoCon = getIntlConnection(this.connection);
         intoCon.ref();
         try {
             const socket = intoCon.socket;
@@ -57,12 +54,12 @@ class Portal {
             socket.sendFlushMessage();
             return await socket.capture(async (code, msg, done) => {
                 switch (code) {
-                    case protocol_js_1.Protocol.BackendMessageCode.NoticeResponse:
+                    case Protocol.BackendMessageCode.NoticeResponse:
                         break;
-                    case protocol_js_1.Protocol.BackendMessageCode.NoData:
+                    case Protocol.BackendMessageCode.NoData:
                         done();
                         break;
-                    case protocol_js_1.Protocol.BackendMessageCode.RowDescription:
+                    case Protocol.BackendMessageCode.RowDescription:
                         done(undefined, msg.fields);
                         break;
                     default:
@@ -75,7 +72,7 @@ class Portal {
         }
     }
     async execute(fetchCount) {
-        const intoCon = (0, intl_connection_js_1.getIntlConnection)(this.connection);
+        const intoCon = getIntlConnection(this.connection);
         intoCon.ref();
         try {
             const socket = intoCon.socket;
@@ -84,24 +81,24 @@ class Portal {
             const rows = [];
             return await socket.capture(async (code, msg, done) => {
                 switch (code) {
-                    case protocol_js_1.Protocol.BackendMessageCode.NoticeResponse:
+                    case Protocol.BackendMessageCode.NoticeResponse:
                         break;
-                    case protocol_js_1.Protocol.BackendMessageCode.NoData:
+                    case Protocol.BackendMessageCode.NoData:
                         done(undefined, { code });
                         break;
-                    case protocol_js_1.Protocol.BackendMessageCode.DataRow:
+                    case Protocol.BackendMessageCode.DataRow:
                         if (Array.isArray(this._columnFormat)) {
-                            rows.push(msg.columns.map((buf, i) => this._columnFormat[i] === protocol_js_1.Protocol.DataFormat.text ? buf.toString('utf8') : buf));
+                            rows.push(msg.columns.map((buf, i) => this._columnFormat[i] === Protocol.DataFormat.text ? buf.toString('utf8') : buf));
                         }
-                        else if (this._columnFormat === protocol_js_1.Protocol.DataFormat.binary)
+                        else if (this._columnFormat === Protocol.DataFormat.binary)
                             rows.push(msg.columns);
                         else
                             rows.push(msg.columns.map((buf) => buf.toString('utf8')));
                         break;
-                    case protocol_js_1.Protocol.BackendMessageCode.PortalSuspended:
+                    case Protocol.BackendMessageCode.PortalSuspended:
                         done(undefined, { code, rows });
                         break;
-                    case protocol_js_1.Protocol.BackendMessageCode.CommandComplete:
+                    case Protocol.BackendMessageCode.CommandComplete:
                         done(undefined, {
                             code,
                             rows,
@@ -119,7 +116,7 @@ class Portal {
         }
     }
     async close() {
-        const intoCon = (0, intl_connection_js_1.getIntlConnection)(this.connection);
+        const intoCon = getIntlConnection(this.connection);
         intoCon.ref();
         try {
             const socket = intoCon.socket;
@@ -127,11 +124,11 @@ class Portal {
             socket.sendSyncMessage();
             return await socket.capture(async (code, msg, done) => {
                 switch (code) {
-                    case protocol_js_1.Protocol.BackendMessageCode.NoticeResponse:
+                    case Protocol.BackendMessageCode.NoticeResponse:
                         break;
-                    case protocol_js_1.Protocol.BackendMessageCode.CloseComplete:
+                    case Protocol.BackendMessageCode.CloseComplete:
                         break;
-                    case protocol_js_1.Protocol.BackendMessageCode.ReadyForQuery:
+                    case Protocol.BackendMessageCode.ReadyForQuery:
                         intoCon.transactionStatus = msg.status;
                         done();
                         break;
@@ -145,4 +142,3 @@ class Portal {
         }
     }
 }
-exports.Portal = Portal;