@pi-r/mysql 0.6.5 → 0.7.0

package/README.md

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

package/client/index.js

@@ -1,5 +1,4 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 exports.DB_SOURCE_TYPE = exports.DB_SOURCE_CLIENT = exports.checkTimeout = exports.executeBatchQuery = exports.executeQuery = exports.setCredential = exports.setAuthentication = void 0;
 const main = require("mysql2");
 const mysql = require("mysql2/promise");
@@ -31,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') {
                     delete result[attr];
                 }
@@ -71,8 +70,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.isPlainObject)(credential.ssl)) {
         this.readTLSConfig(credential.ssl);
     }
@@ -121,16 +120,16 @@ function setCredential(item) {
     if (config) {
         const { max, idle, queue_max, timeout } = config;
         if (max > 0) {
-            credential.connectionLimit ?? (credential.connectionLimit = max);
+            credential.connectionLimit ??= max;
         }
         if (idle >= 0) {
-            credential.idleTimeout ?? (credential.idleTimeout = idle);
+            credential.idleTimeout ??= idle;
         }
         if (queue_max >= 0) {
-            credential.queueLimit ?? (credential.queueLimit = queue_max);
+            credential.queueLimit ??= queue_max;
         }
         if (timeout > 0) {
-            credential.connectTimeout ?? (credential.connectTimeout = timeout);
+            credential.connectTimeout ??= timeout;
         }
     }
     const poolKey = getPoolKey(credential);
@@ -168,7 +167,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("mysql", sessionKey);
     const tasks = new Array(length);
@@ -234,7 +233,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
     for (let i = 0, mysql2Client, mysql2Credential; i < length; ++i) {
         const item = batch[i];
         const { source, query, params, ignoreCache } = item;
-        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("mysql", 'options', null, mysql2Credential || item.credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
+        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("mysql", 'options', mysql2Credential || item.credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
         let credential, error;
         if (streamRow) {
             if (mysql2Credential) {
@@ -266,8 +265,8 @@ async function executeBatchQuery(batch, options = '', outResult) {
         let queryString = '';
         if (caching && ignoreCache !== true && !streamRow) {
             queryString = Db.asString(query, true) + '_' + Db.asString(params, true);
-            const result = this.getQueryResult(source, removePoolProperties(credential), queryString, cacheValue);
             if (ignoreCache !== 1) {
+                const result = this.getQueryResult(source, removePoolProperties(credential), queryString, cacheValue);
                 if (result) {
                     if (parallel) {
                         tasks[i] = Promise.resolve(result);
@@ -323,7 +322,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                         }
                         rows.push(row);
                     })
-                        .on('error', err => error || (error = err))
+                        .on('error', err => error ||= err)
                         .on('end', () => {
                         if (error && this.handleFail(error, item, { errorQuery, commandType })) {
                             reject(error);
@@ -377,8 +376,16 @@ async function executeBatchQuery(batch, options = '', outResult) {
     }
     return this.processRows(batch, tasks, {
         disconnect: () => {
-            clients.forEach(async (item) => item.end(err => err && this.writeFail(["Unable to close connnection", "mysql"], err, { type: 65536, fatal: false })));
-            pools.forEach(item => item.release());
+            clients.forEach(item => {
+                item.end(err => {
+                    if (err) {
+                        this.writeFail(["Unable to close connnection", "mysql"], err, { type: 65536, fatal: false });
+                    }
+                });
+            });
+            pools.forEach(item => {
+                item.release();
+            });
         },
         parallel
     }, outResult);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mysql",
-  "version": "0.6.5",
+  "version": "0.7.0",
   "description": "MySQL 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.6",
-    "@e-mc/types": "^0.8.6",
-    "mysql2": "^3.9.2"
+    "@e-mc/db": "^0.9.0",
+    "@e-mc/types": "^0.9.0",
+    "mysql2": "^3.9.7"
   }
 }

package/types/index.d.ts

@@ -6,7 +6,7 @@ import type { SecureContextOptions } from 'tls';
 
 import type { PoolOptions, QueryOptions } from 'mysql2/promise';
 
-export interface MySQLDataSource<T = unknown> extends DbDataSource<string | QueryOptions, unknown, unknown, string | MySQLCredential, string>, ExecuteAction<T> {
+export interface MySQLDataSource<T = unknown> extends DbDataSource<string | QueryOptions, unknown, unknown, MySQLCredential, string>, ExecuteAction<T> {
     source: "mysql";
 }