postgrejs 2.22.2 → 2.22.3

package/esm/data-types/int8-type.js

@@ -6,7 +6,9 @@ export const Int8Type = {
     oid: DataTypeOIDs.int8,
     jsType: 'BigInt',
     parseBinary(buf) {
-        const v = typeof buf.readBigInt64BE === 'function' ? buf.readBigInt64BE(0) : readBigInt64BE(buf);
+        const v = typeof buf.readBigInt64BE === 'function'
+            ? buf.readBigInt64BE(0)
+            : readBigInt64BE(buf);
         return v >= -maxSafeInteger && v <= maxSafeInteger ? Number(v) : v;
     },
     encodeBinary(buf, v) {
@@ -17,7 +19,10 @@ export const Int8Type = {
         return v >= -maxSafeInteger && v <= maxSafeInteger ? Number(v) : v;
     },
     isType(v) {
-        return typeof v === 'bigint' || (typeof v === 'number' && Number.isInteger(v) && v > Number.MAX_SAFE_INTEGER);
+        return (typeof v === 'bigint' ||
+            (typeof v === 'number' &&
+                Number.isInteger(v) &&
+                v > Number.MAX_SAFE_INTEGER));
     },
 };
 export const ArrayInt8Type = {

package/esm/data-types/json-type.js

@@ -5,7 +5,8 @@ export const JsonType = {
     jsType: 'string',
     parseBinary(v, options) {
         const content = v.toString('utf8');
-        const fetchAsString = options.fetchAsString && options.fetchAsString.includes(DataTypeOIDs.jsonb);
+        const fetchAsString = options.fetchAsString &&
+            options.fetchAsString.includes(DataTypeOIDs.jsonb);
         if (fetchAsString)
             return content;
         return content ? JSON.parse(content) : undefined;
@@ -18,7 +19,8 @@ export const JsonType = {
         return '' + v;
     },
     parseText(v, options) {
-        const fetchAsString = options.fetchAsString && options.fetchAsString.includes(DataTypeOIDs.jsonb);
+        const fetchAsString = options.fetchAsString &&
+            options.fetchAsString.includes(DataTypeOIDs.jsonb);
         if (fetchAsString)
             return v;
         return v ? JSON.parse(v) : null;

package/esm/data-types/jsonb-type.js

@@ -8,7 +8,8 @@ export const JsonbType = {
         const buf = new BufferReader(v);
         if (buf.readUInt8() !== 1)
             throw new Error('Unexpected Jsonb version value in header');
-        const fetchAsString = options.fetchAsString && options.fetchAsString.includes(DataTypeOIDs.json);
+        const fetchAsString = options.fetchAsString &&
+            options.fetchAsString.includes(DataTypeOIDs.json);
         const content = buf.readLString(buf.length - buf.offset);
         if (fetchAsString)
             return content;
@@ -22,7 +23,8 @@ export const JsonbType = {
         return '\x0001' + v;
     },
     parseText(v, options) {
-        const fetchAsString = options.fetchAsString && options.fetchAsString.includes(DataTypeOIDs.json);
+        const fetchAsString = options.fetchAsString &&
+            options.fetchAsString.includes(DataTypeOIDs.json);
         if (fetchAsString)
             return v;
         return v ? JSON.parse(v) : null;

package/esm/data-types/lseg-type.js

@@ -22,7 +22,10 @@ export const LsegType = {
         buf.writeDoubleBE(v.y2);
     },
     parseText(v) {
-        const m = v.match(LSEG_PATTERN1) || v.match(LSEG_PATTERN2) || v.match(LSEG_PATTERN3) || v.match(LSEG_PATTERN4);
+        const m = v.match(LSEG_PATTERN1) ||
+            v.match(LSEG_PATTERN2) ||
+            v.match(LSEG_PATTERN3) ||
+            v.match(LSEG_PATTERN4);
         if (!m)
             return undefined;
         return {

package/esm/data-types/point-type.js

@@ -25,7 +25,10 @@ export const PointType = {
         };
     },
     isType(v) {
-        return typeof v === 'object' && Object.keys(v).length === 2 && typeof v.x === 'number' && typeof v.y === 'number';
+        return (typeof v === 'object' &&
+            Object.keys(v).length === 2 &&
+            typeof v.x === 'number' &&
+            typeof v.y === 'number');
     },
 };
 export const ArrayPointType = {

package/esm/data-types/time-type.js

@@ -6,7 +6,8 @@ export const TimeType = {
     oid: DataTypeOIDs.time,
     jsType: 'string',
     parseBinary(v, options) {
-        const fetchAsString = options.fetchAsString && options.fetchAsString.includes(DataTypeOIDs.time);
+        const fetchAsString = options.fetchAsString &&
+            options.fetchAsString.includes(DataTypeOIDs.time);
         const hi = v.readInt32BE();
         const lo = v.readUInt32BE(4);
         let d = new Date((lo + hi * timeMul) / 1000);
@@ -21,7 +22,9 @@ export const TimeType = {
         if (!(v instanceof Date))
             v = new Date(v);
         // Postgresql ignores timezone data so we are
-        let n = options.utcDates ? v.getTime() : v.getTime() - v.getTimezoneOffset() * 60 * 1000;
+        let n = options.utcDates
+            ? v.getTime()
+            : v.getTime() - v.getTimezoneOffset() * 60 * 1000;
         n = n * 1000;
         const hi = Math.floor(n / timeMul);
         const lo = n - hi * timeMul;
@@ -29,12 +32,16 @@ export const TimeType = {
         buf.writeUInt32BE(lo);
     },
     parseText(v, options) {
-        if (options.fetchAsString && options.fetchAsString.includes(DataTypeOIDs.time))
+        if (options.fetchAsString &&
+            options.fetchAsString.includes(DataTypeOIDs.time))
             return v;
         return parseTime(v, false, options.utcDates);
     },
     isType(v) {
-        return ((v instanceof Date && v.getFullYear() === 1970 && v.getMonth() === 0 && v.getDate() === 1) ||
+        return ((v instanceof Date &&
+            v.getFullYear() === 1970 &&
+            v.getMonth() === 0 &&
+            v.getDate() === 1) ||
             (typeof v === 'string' && STRICT_TIME_PATTERN.test(v)));
     },
 };
@@ -42,7 +49,11 @@ function padZero(v) {
     return v < 9 ? '0' + v : '' + v;
 }
 function dateToTimeString(d) {
-    return padZero(d.getHours()) + ':' + padZero(d.getMinutes()) + ':' + padZero(d.getSeconds());
+    return (padZero(d.getHours()) +
+        ':' +
+        padZero(d.getMinutes()) +
+        ':' +
+        padZero(d.getSeconds()));
 }
 export const ArrayTimeType = {
     ...TimeType,

package/esm/data-types/timestamp-type.js

@@ -7,7 +7,8 @@ export const TimestampType = {
     oid: DataTypeOIDs.timestamp,
     jsType: 'Date',
     parseBinary(v, options) {
-        const fetchAsString = options.fetchAsString && options.fetchAsString.includes(DataTypeOIDs.timestamp);
+        const fetchAsString = options.fetchAsString &&
+            options.fetchAsString.includes(DataTypeOIDs.timestamp);
         const hi = v.readInt32BE();
         const lo = v.readUInt32BE(4);
         if (lo === 0xffffffff && hi === 0x7fffffff)
@@ -37,7 +38,9 @@ export const TimestampType = {
         if (!(v instanceof Date))
             v = new Date(v);
         // Postgresql ignores timezone data so we are
-        let n = options.utcDates ? v.getTime() : v.getTime() - v.getTimezoneOffset() * 60 * 1000;
+        let n = options.utcDates
+            ? v.getTime()
+            : v.getTime() - v.getTimezoneOffset() * 60 * 1000;
         n = (n - timeShift) * 1000;
         const hi = Math.floor(n / timeMul);
         const lo = n - hi * timeMul;
@@ -45,14 +48,18 @@ export const TimestampType = {
         buf.writeUInt32BE(lo);
     },
     parseText(v, options) {
-        if (options.fetchAsString && options.fetchAsString.includes(DataTypeOIDs.timestamp))
+        if (options.fetchAsString &&
+            options.fetchAsString.includes(DataTypeOIDs.timestamp))
             return v;
         return parseDateTime(v, true, false, options.utcDates);
     },
     isType(v) {
         return (v instanceof Date &&
             !(v.getFullYear() === 1970 && v.getMonth() === 0 && v.getDate() === 1) &&
-            !(v.getHours() === 0 && v.getMinutes() === 0 && v.getSeconds() === 0 && v.getMilliseconds() === 0));
+            !(v.getHours() === 0 &&
+                v.getMinutes() === 0 &&
+                v.getSeconds() === 0 &&
+                v.getMilliseconds() === 0));
     },
 };
 function padZero(v) {

package/esm/data-types/timestamptz-type.js

@@ -7,7 +7,8 @@ export const TimestamptzType = {
     oid: DataTypeOIDs.timestamptz,
     jsType: 'Date',
     parseBinary(v, options) {
-        const fetchAsString = options.fetchAsString && options.fetchAsString.includes(DataTypeOIDs.timestamptz);
+        const fetchAsString = options.fetchAsString &&
+            options.fetchAsString.includes(DataTypeOIDs.timestamptz);
         const hi = v.readInt32BE();
         const lo = v.readUInt32BE(4);
         if (lo === 0xffffffff && hi === 0x7fffffff)
@@ -45,7 +46,8 @@ export const TimestamptzType = {
     },
     parseText(v, options) {
         const d = parseDateTime(v, true, true, options.utcDates);
-        if (options.fetchAsString && options.fetchAsString.includes(DataTypeOIDs.timestamptz)) {
+        if (options.fetchAsString &&
+            options.fetchAsString.includes(DataTypeOIDs.timestamptz)) {
             if (d instanceof Date)
                 return dateToTimestamptzString(d);
             if (d === Infinity)

package/esm/protocol/backend.js

@@ -150,13 +150,17 @@ function parseCopyData(io, code, len) {
 }
 function parseCopyResponse(io) {
     const out = {
-        overallFormat: io.readUInt8() === 0 ? Protocol.DataFormat.text : Protocol.DataFormat.binary,
+        overallFormat: io.readUInt8() === 0
+            ? Protocol.DataFormat.text
+            : Protocol.DataFormat.binary,
         columnCount: io.readUInt16BE(),
     };
     if (out.columnCount) {
         out.columnFormats = [];
         for (let i = 0; i < out.columnCount; i++) {
-            out.columnFormats.push(io.readUInt16BE() === 0 ? Protocol.DataFormat.text : Protocol.DataFormat.binary);
+            out.columnFormats.push(io.readUInt16BE() === 0
+                ? Protocol.DataFormat.text
+                : Protocol.DataFormat.binary);
         }
     }
     return out;
@@ -244,7 +248,9 @@ function parseRowDescription(io) {
             dataTypeId: io.readInt32BE(),
             fixedSize: io.readInt16BE(),
             modifier: io.readInt32BE(),
-            format: io.readInt16BE() === 0 ? Protocol.DataFormat.text : Protocol.DataFormat.binary,
+            format: io.readInt16BE() === 0
+                ? Protocol.DataFormat.text
+                : Protocol.DataFormat.binary,
         };
         out.fields.push(field);
     }

package/esm/protocol/frontend.js

@@ -4,9 +4,27 @@ import { stringifyArrayLiteral } from '../util/stringify-arrayliteral.js';
 import { Protocol } from './protocol.js';
 import { SmartBuffer } from './smart-buffer.js';
 const DataFormat = Protocol.DataFormat;
-const StaticFlushBuffer = Buffer.from([Protocol.FrontendMessageCode.Flush, 0x00, 0x00, 0x00, 0x04]);
-const StaticTerminateBuffer = Buffer.from([Protocol.FrontendMessageCode.Terminate, 0x00, 0x00, 0x00, 0x04]);
-const StaticSyncBuffer = Buffer.from([Protocol.FrontendMessageCode.Sync, 0x00, 0x00, 0x00, 0x04]);
+const StaticFlushBuffer = Buffer.from([
+    Protocol.FrontendMessageCode.Flush,
+    0x00,
+    0x00,
+    0x00,
+    0x04,
+]);
+const StaticTerminateBuffer = Buffer.from([
+    Protocol.FrontendMessageCode.Terminate,
+    0x00,
+    0x00,
+    0x00,
+    0x04,
+]);
+const StaticSyncBuffer = Buffer.from([
+    Protocol.FrontendMessageCode.Sync,
+    0x00,
+    0x00,
+    0x00,
+    0x04,
+]);
 export class Frontend {
     constructor(options) {
         this._io = new SmartBuffer(options?.buffer);
@@ -29,7 +47,9 @@ export class Frontend {
             if (k !== 'client_encoding')
                 io.writeCString(k, 'utf8').writeCString(v, 'utf8');
         }
-        io.writeCString('client_encoding', 'utf8').writeCString('UTF8', 'utf8').writeUInt8(0);
+        io.writeCString('client_encoding', 'utf8')
+            .writeCString('UTF8', 'utf8')
+            .writeUInt8(0);
         return setLengthAndFlush(io, 0);
     }
     getPasswordMessage(password) {
@@ -86,7 +106,9 @@ export class Frontend {
             .writeCString(args.portal || '', 'utf8')
             .writeCString(args.statement || '', 'utf8');
         const { params, paramTypes, queryOptions } = args;
-        const columnFormat = queryOptions.columnFormat != null ? queryOptions.columnFormat : DEFAULT_COLUMN_FORMAT;
+        const columnFormat = queryOptions.columnFormat != null
+            ? queryOptions.columnFormat
+            : DEFAULT_COLUMN_FORMAT;
         if (params && params.length) {
             io.writeInt16BE(params.length);
             const formatOffset = io.offset;
@@ -104,7 +126,8 @@ export class Frontend {
                 const dataTypeOid = paramTypes ? paramTypes[i] : undefined;
                 const dt = dataTypeOid ? args.typeMap.get(dataTypeOid) : undefined;
                 if (dt) {
-                    if (typeof dt.encodeAsNull === 'function' && dt.encodeAsNull(v, queryOptions)) {
+                    if (typeof dt.encodeAsNull === 'function' &&
+                        dt.encodeAsNull(v, queryOptions)) {
                         io.writeInt32BE(-1);
                         continue;
                     }
@@ -125,7 +148,9 @@ export class Frontend {
                         io.buffer.writeInt32BE(io.length - dataOffset, dataOffset - 4); // Update length
                     }
                     else if (typeof dt.encodeText === 'function') {
-                        v = dt.elementsOID ? stringifyArrayLiteral(v, queryOptions, dt.encodeText) : dt.encodeText(v, queryOptions);
+                        v = dt.elementsOID
+                            ? stringifyArrayLiteral(v, queryOptions, dt.encodeText)
+                            : dt.encodeText(v, queryOptions);
                         io.writeLString(v, 'utf8');
                     }
                 }
@@ -163,7 +188,9 @@ export class Frontend {
     }
     getDescribeMessage(args) {
         if (args.name && args.name.length > 63) {
-            throw new Error(args.type === 'P' ? 'Portal' : 'Statement name length must be lower than 63');
+            throw new Error(args.type === 'P'
+                ? 'Portal'
+                : 'Statement name length must be lower than 63');
         }
         const io = this._io
             .start()
@@ -174,7 +201,8 @@ export class Frontend {
         return setLengthAndFlush(io, 1);
     }
     getExecuteMessage(args) {
-        if (args.fetchCount && (args.fetchCount < 0 || args.fetchCount > 4294967295)) {
+        if (args.fetchCount &&
+            (args.fetchCount < 0 || args.fetchCount > 4294967295)) {
             throw new Error('fetchCount can be between 0 and 4294967295');
         }
         const io = this._io
@@ -187,7 +215,9 @@ export class Frontend {
     }
     getCloseMessage(args) {
         if (args.name && args.name.length > 63) {
-            throw new Error(args.type === 'P' ? 'Portal' : 'Statement name length must be lower than 63');
+            throw new Error(args.type === 'P'
+                ? 'Portal'
+                : 'Statement name length must be lower than 63');
         }
         const io = this._io
             .start()

package/esm/protocol/pg-socket.js

@@ -153,7 +153,8 @@ export class PgSocket extends SafeEventEmitter {
         this._send(this._frontend.getSyncMessage());
     }
     capture(callback) {
-        if (this._state === ConnectionState.CLOSING || this._state === ConnectionState.CLOSED) {
+        if (this._state === ConnectionState.CLOSING ||
+            this._state === ConnectionState.CLOSED) {
             return Promise.reject(new Error('Connection closed'));
         }
         if (this._state !== ConnectionState.READY)
@@ -275,7 +276,9 @@ export class PgSocket extends SafeEventEmitter {
     }
     _resolvePassword(cb) {
         (async () => {
-            const pass = typeof this.options.password === 'function' ? await this.options.password() : this.options.password;
+            const pass = typeof this.options.password === 'function'
+                ? await this.options.password()
+                : this.options.password;
             cb(pass || '');
         })().catch(err => this._handleError(err));
     }

package/esm/protocol/sasl.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-bitwise */
 import crypto from 'crypto';
 export var SASL;
 (function (SASL) {
@@ -57,7 +56,8 @@ export var SASL;
         const serverKey = hmac(saltPass, SERVER_KEY);
         const serverSignatureBytes = hmac(serverKey, authMessage);
         session.serverSignature = serverSignatureBytes.toString('base64');
-        session.clientFinalMessage = clientFinalMessageWithoutProof + ',p=' + clientProof;
+        session.clientFinalMessage =
+            clientFinalMessageWithoutProof + ',p=' + clientProof;
     }
     SASL.continueSession = continueSession;
     function finalizeSession(session, data) {

package/esm/protocol/smart-buffer.js

@@ -3,8 +3,7 @@ import { writeBigUInt64BE } from '../util/bigint-methods.js';
 import { BufferReader } from './buffer-reader.js';
 export class SmartBuffer extends BufferReader {
     constructor(cfg) {
-        // @ts-ignore
-        super(Buffer.allocUnsafe((cfg?.pageSize ? parseInt(cfg.pageSize, 10) : 0) || SmartBuffer.DEFAULT_PAGE_SIZE));
+        super(Buffer.allocUnsafe(cfg?.pageSize || SmartBuffer.DEFAULT_PAGE_SIZE));
         this._lastHouseKeep = 0;
         this._stMaxPages = 1;
         this._length = 0;

package/esm/safe-event-emitter.js

@@ -6,7 +6,7 @@ export class SafeEventEmitter extends EventEmitter {
                 return false;
             return super.emit(event, ...args);
         }
-        catch (ignored) {
+        catch {
             return false;
         }
     }

package/esm/util/bigint-methods.js

@@ -1,4 +1,3 @@
-/* eslint-disable no-bitwise */
 const big0 = BigInt(0);
 const beAnd = BigInt('0xffffffff');
 const big32 = BigInt(32);
@@ -12,7 +11,11 @@ export function readBigInt64BE(buf, offset = 0) {
         buf[++offset] * 2 ** 16 +
         buf[++offset] * 2 ** 8 +
         buf[++offset];
-    return ((BigInt(val) << big32) + BigInt(buf[++offset] * 2 ** 24 + buf[++offset] * 2 ** 16 + buf[++offset] * 2 ** 8 + last));
+    return ((BigInt(val) << big32) +
+        BigInt(buf[++offset] * 2 ** 24 +
+            buf[++offset] * 2 ** 16 +
+            buf[++offset] * 2 ** 8 +
+            last));
 }
 export function writeBigUInt64BE(buf, value, offset = 0) {
     // @ts-ignore

package/esm/util/connection-config.js

@@ -1,4 +1,4 @@
-import merge from 'putil-merge';
+import { merge } from '@jsopen/objects';
 import { configFromEnv } from './config-from-env.js';
 export function getConnectionConfig(config) {
     const cfg = configFromEnv();
@@ -23,7 +23,7 @@ export function parseConnectionString(str) {
     if (!str.includes('://'))
         str = 'postgres://' + str;
     const parsed = new URL(str);
-    const getFirst = (v) => (typeof v === 'string' ? v : Array.isArray(v) ? v[0] : '');
+    const getFirst = (v) => typeof v === 'string' ? v : Array.isArray(v) ? v[0] : '';
     const cfg = {};
     cfg.host = decodeURI(parsed.hostname || '');
     if (parsed.port)

package/esm/util/parse-datetime.js

@@ -1,9 +1,7 @@
 // noinspection RegExpUnnecessaryNonCapturingGroup
 import { fastParseInt } from './fast-parseint.js';
 // noinspection RegExpUnnecessaryNonCapturingGroup
-const TIMESTAMP_PATTERN = 
-// eslint-disable-next-line
-/^(\d{4})-?(0[1-9]|1[012])?-?([123]0|[012][1-9]|31)?(?:[T ]?([01][0-9]|2[0-3]):?([0-5][0-9]):?([0-5][0-9])?(?:\.(\d+))?(?:(Z)|(?:([+-])([01]?[0-9]|2[0-3]):?([0-5][0-9])?))?)?$/;
+const TIMESTAMP_PATTERN = /^(\d{4})-?(0[1-9]|1[012])?-?([123]0|[012][1-9]|31)?(?:[T ]?([01][0-9]|2[0-3]):?([0-5][0-9]):?([0-5][0-9])?(?:\.(\d+))?(?:(Z)|(?:([+-])([01]?[0-9]|2[0-3]):?([0-5][0-9])?))?)?$/;
 const INFINITY_PATTERN = /^-?infinity$/;
 export function parseDateTime(str, parseTime, parseTimeZone, utc) {
     let m = str.match(TIMESTAMP_PATTERN);
@@ -13,7 +11,9 @@ export function parseDateTime(str, parseTime, parseTimeZone, utc) {
             return Number(str.replace('i', 'I'));
         return new Date('invalid');
     }
-    const args = [1970, 0, 1, 0, 0, 0, 0];
+    const args = [
+        1970, 0, 1, 0, 0, 0, 0,
+    ];
     const l = parseTime ? 7 : 3;
     for (let i = 0; i < l; i++) {
         const s = m[i + 1];

package/esm/util/parse-row.js

@@ -2,6 +2,7 @@ export function parseRow(parsers, row, options) {
     const l = row.length;
     let i;
     for (i = 0; i < l; i++) {
-        row[i] = row[i] == null ? null : parsers[i].call(undefined, row[i], options);
+        row[i] =
+            row[i] == null ? null : parsers[i].call(undefined, row[i], options);
     }
 }

package/esm/util/parse-time.js

@@ -1,5 +1,4 @@
 import { fastParseInt } from './fast-parseint.js';
-// eslint-disable-next-line
 // noinspection RegExpUnnecessaryNonCapturingGroup
 export const STRICT_TIME_PATTERN = /^([01][0-9]|2[0-3]):([0-5][0-9]):([0-5][0-9])(?:\.(\d+))?(?:(Z)|(?:([+-])([01]?[0-9]|2[0-3]):?([0-5][0-9])?))?$/;
 // noinspection RegExpUnnecessaryNonCapturingGroup
@@ -8,7 +7,9 @@ export function parseTime(str, parseTimeZone, utc) {
     const m = str.match(TIME_PATTERN);
     if (!m)
         return new Date('invalid');
-    const args = [1970, 0, 1, 0, 0, 0, 0];
+    const args = [
+        1970, 0, 1, 0, 0, 0, 0,
+    ];
     for (let i = 1; i < 4; i++) {
         const s = m[i];
         args[i + 2] = fastParseInt(s) || 0;

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "postgrejs",
   "description": "Professional PostgreSQL client NodeJS",
-  "version": "2.22.2",
+  "version": "2.22.3",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
-    "doublylinked": "^2.5.4",
+    "@jsopen/objects": "^1.5.0",
+    "doublylinked": "^2.5.5",
     "lightning-pool": "^4.10.0",
     "postgres-bytea": "^3.0.0",
     "power-tasks": "^1.11.0",
-    "putil-merge": "^3.13.0",
     "putil-promisify": "^1.10.1",
     "putil-varhelpers": "^1.6.5",
     "tslib": "^2.8.1"