@pi-r/postgres 0.6.7 → 0.7.1

package/README.md

@@ -1,10 +1,7 @@
-# @pi-r/postgres
+### @pi-r/postgres
 
-## Documentation
+https://e-mc.readthedocs.io/en/latest/db/postgres.html
 
-- [E-mc](https://e-mc.readthedocs.io/en/latest/db/postgres.html)
-- [squared](https://squared.readthedocs.io)
-
-## LICENSE
+### LICENSE
 
 MIT

package/client/index.js

@@ -30,7 +30,7 @@ function removePoolProperties(credential) {
         for (let i = 0, length = POOL_UNUSED.length; i < length; ++i) {
             const attr = POOL_UNUSED[i];
             if (attr in credential) {
-                result || (result = { ...credential });
+                result ||= { ...credential };
                 if (attr === 'ssl' && (0, types_1.isObject)(result[attr])) {
                     result[attr] = true;
                 }
@@ -46,20 +46,19 @@ function removePoolProperties(credential) {
     return credential;
 }
 function fromConnectionString(credential, uri) {
-    var _a;
     const { user, password, host, port, database, application_name, ssl } = connectionString.parse(uri);
     if (!credential.user) {
         credential.user = user;
         credential.password = password;
     }
-    credential.host || (credential.host = host);
+    credential.host ||= host;
     if (port) {
-        credential.port || (credential.port = parseInt(port));
+        credential.port ||= parseInt(port);
     }
-    credential.database || (credential.database = database);
-    credential.application_name || (credential.application_name = application_name);
+    credential.database ||= database;
+    credential.application_name ||= application_name;
     if (ssl) {
-        (_a = credential.ssl) !== null && _a !== void 0 ? _a : (credential.ssl = (0, types_1.isPlainObject)(ssl) ? ssl : true);
+        credential.ssl ??= (0, types_1.isPlainObject)(ssl) ? ssl : true;
     }
     return credential;
 }
@@ -74,8 +73,8 @@ function getPoolKey(credential) {
 }
 function setAuthentication(credential) {
     const auth = (0, util_1.parseServerAuth)(credential);
-    credential.host || (credential.host = auth.hostname);
-    credential.user || (credential.user = auth.username);
+    credential.host ||= auth.hostname;
+    credential.user ||= auth.username;
     if ((0, types_1.isString)(credential.connectionString)) {
         fromConnectionString(credential, credential.connectionString);
     }
@@ -85,7 +84,6 @@ function setAuthentication(credential) {
 }
 exports.setAuthentication = setAuthentication;
 function setCredential(item) {
-    var _a, _b, _c, _d, _e;
     let credential = this.getCredential(item);
     if (credential) {
         setAuthentication.call(this, credential);
@@ -117,7 +115,7 @@ function setCredential(item) {
     }
     let username, password, pool;
     if ((0, types_1.isString)(usePool)) {
-        if (username = credential.user || credential.connectionString && ((_a = (0, util_1.parseConnectionString)(credential.connectionString)) === null || _a === void 0 ? void 0 : _a.username)) {
+        if (username = credential.user || credential.connectionString && (0, util_1.parseConnectionString)(credential.connectionString)?.username) {
             [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
             if (pool) {
                 pool.add(item, password);
@@ -133,16 +131,16 @@ function setCredential(item) {
     if (config) {
         const { min, max, idle, timeout } = config;
         if (min >= 0) {
-            (_b = credential.min) !== null && _b !== void 0 ? _b : (credential.min = min);
+            credential.min ??= min;
         }
         if (max > 0) {
-            (_c = credential.max) !== null && _c !== void 0 ? _c : (credential.max = max);
+            credential.max ??= max;
         }
         if (idle > 0) {
-            (_d = credential.idleTimeoutMillis) !== null && _d !== void 0 ? _d : (credential.idleTimeoutMillis = idle);
+            credential.idleTimeoutMillis ??= idle;
         }
         if (timeout > 0) {
-            (_e = credential.connectionTimeoutMillis) !== null && _e !== void 0 ? _e : (credential.connectionTimeoutMillis = timeout);
+            credential.connectionTimeoutMillis ??= timeout;
         }
     }
     const poolKey = getPoolKey(credential);
@@ -158,7 +156,6 @@ async function executeQuery(item, options) {
 }
 exports.executeQuery = executeQuery;
 async function executeBatchQuery(batch, options = '', outResult) {
-    var _a;
     const length = batch.length;
     if (length === 0) {
         return [];
@@ -181,7 +178,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         parallel = !batch.some(item => item.parallel === false);
     }
     if (!parallel) {
-        outResult || (outResult = new Array(length));
+        outResult ||= new Array(length);
     }
     const caching = this.hasCache("postgres", sessionKey);
     const tasks = new Array(length);
@@ -240,7 +237,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         item.transactionState &= ~64;
         return client;
     };
-    if ((_a = this.host) === null || _a === void 0 ? void 0 : _a.username) {
+    if (this.host?.username) {
         this.applyCommand(...batch);
     }
     for (let i = 0; i < length; ++i) {
@@ -264,7 +261,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             continue;
         }
         item.transactionState = 1;
-        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("postgres", 'options', null, credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
+        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("postgres", 'options', credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
         const cacheValue = ignoreCache === undefined ? sessionKey : Array.isArray(ignoreCache) ? { sessionKey, exclusiveOf: ignoreCache } : { sessionKey, renewCache: ignoreCache === 0 };
         let queryString = '';
         if (caching && ignoreCache !== true) {
@@ -322,7 +319,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         }
                         rows.push(row);
                     })
-                        .on('error', err => error || (error = err))
+                        .on('error', err => error ||= err)
                         .on('close', () => {
                         if (error && this.handleFail(error, item, { errorQuery, commandType })) {
                             reject(error);
@@ -361,8 +358,16 @@ async function executeBatchQuery(batch, options = '', outResult) {
     }
     return this.processRows(batch, tasks, {
         disconnect: () => {
-            clients.forEach(item => item.end(err => err && this.writeFail(["Unable to close connnection", "postgres"], err, { type: 65536, fatal: false })));
-            pools.forEach(item => item.release());
+            clients.forEach(item => {
+                item.end(err => {
+                    if (err) {
+                        this.writeFail(["Unable to close connnection", "postgres"], err, { type: 65536, fatal: false });
+                    }
+                });
+            });
+            pools.forEach(item => {
+                item.release();
+            });
         },
         parallel
     }, outResult);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/postgres",
-  "version": "0.6.7",
+  "version": "0.7.1",
   "description": "PostgreSQL client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -21,8 +21,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.8.8",
-    "@e-mc/types": "^0.8.8",
+    "@e-mc/db": "^0.9.2",
+    "@e-mc/types": "^0.9.2",
     "pg": "^8.11.5",
     "pg-connection-string": "^2.6.4",
     "pg-query-stream": "^4.5.5"

package/types/index.d.ts

@@ -5,7 +5,7 @@ import type { ExecuteAction, ServerAuth } from '@e-mc/types/lib/db';
 // @ts-ignore
 import type { PoolConfig, QueryArrayConfig } from 'pg';
 
-export interface PostgresDataSource<T = unknown[]> extends DbDataSource<string | QueryArrayConfig, unknown, unknown, string | PostgresCredential, string>, ExecuteAction<T> {
+export interface PostgresDataSource<T = unknown[]> extends DbDataSource<string | QueryArrayConfig, unknown, unknown, PostgresCredential, string>, ExecuteAction<T> {
     source: "postgres";
 }