@pi-r/mariadb 0.6.5 → 0.7.0

package/README.md

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

package/client/index.d.ts

@@ -1,7 +1,11 @@
+import type { IDb } from '@e-mc/types/lib';
+
 import type { IDbSourceClient } from '@e-mc/db/types';
 
-import type { MariaDBDataSource } from '../types';
+import type { MariaDBCredential, MariaDBDataSource } from '../types';
 
-declare const MariaDB: IDbSourceClient<MariaDBDataSource>;
+declare const MariaDB: IDbSourceClient<MariaDBDataSource> & {
+    setAuthentication(this: IDb, credential: MariaDBCredential): void;
+};
 
 export = MariaDB;

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 mariadb = require("mariadb");
 const util_1 = require("@e-mc/db/util");
@@ -30,7 +29,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];
                 }
@@ -63,8 +62,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);
     }
@@ -125,22 +124,22 @@ function setCredential(item) {
     if (config) {
         const { min, max, idle, queue_idle, timeout, socket_timeout } = config;
         if (min >= 0) {
-            credential.minimumIdle ?? (credential.minimumIdle = min);
+            credential.minimumIdle ??= min;
         }
         if (max > 0) {
-            credential.connectionLimit ?? (credential.connectionLimit = max);
+            credential.connectionLimit ??= max;
         }
         if (idle >= 0) {
-            credential.idleTimeout ?? (credential.idleTimeout = idle);
+            credential.idleTimeout ??= idle;
         }
         if (queue_idle > 0) {
-            credential.acquireTimeout ?? (credential.acquireTimeout = queue_idle);
+            credential.acquireTimeout ??= queue_idle;
         }
         if (timeout > 0) {
-            credential.connectTimeout ?? (credential.connectTimeout = timeout);
+            credential.connectTimeout ??= timeout;
         }
         if (socket_timeout > 0) {
-            credential.socketTimeout ?? (credential.socketTimeout = socket_timeout);
+            credential.socketTimeout ??= socket_timeout;
         }
     }
     const poolKey = getPoolKey(credential);
@@ -178,7 +177,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("mariadb", sessionKey);
     const tasks = new Array(length);
@@ -245,7 +244,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         const item = batch[i];
         const { source, query, params, ignoreCache } = item;
         let credential = mariaDBCredential || onceCredential, error;
-        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("mariadb", 'options', null, item.credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
+        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("mariadb", 'options', item.credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
         if (!(0, types_1.isPlainObject)(credential = item.credential) && (error = (0, types_1.errorMessage)(source, "Invalid credentials")) || !query && (error = (0, types_1.errorMessage)(source, "Missing database query"))) {
             if (this.handleFail(error, item, { errorQuery })) {
                 if (!parallel) {
@@ -267,8 +266,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);
@@ -369,8 +368,12 @@ async function executeBatchQuery(batch, options = '', outResult) {
     }
     return this.processRows(batch, tasks, {
         disconnect: () => {
-            clients.forEach(async (item) => item.end());
-            pools.forEach(async (item) => item.release());
+            clients.forEach(item => {
+                item.end();
+            });
+            pools.forEach(item => {
+                item.release();
+            });
         },
         parallel
     }, outResult);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/mariadb",
-  "version": "0.6.5",
+  "version": "0.7.0",
   "description": "MariaDB 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",
-    "mariadb": "^3.2.3"
+    "@e-mc/db": "^0.9.0",
+    "@e-mc/types": "^0.9.0",
+    "mariadb": "^3.3.0"
   }
 }

package/types/index.d.ts

@@ -6,7 +6,7 @@ import type { SecureContextOptions } from 'tls';
 
 import type { PoolConfig, QueryConfig } from 'mariadb';
 
-export interface MariaDBDataSource<T = unknown> extends DbDataSource<string | QueryConfig, unknown, unknown, string | MariaDBCredential, string>, ExecuteAction<T> {
+export interface MariaDBDataSource<T = unknown> extends DbDataSource<string | QueryConfig, unknown, unknown, MariaDBCredential, string>, ExecuteAction<T> {
     source: "mariadb";
 }