@e-mc/db 0.7.1 → 0.8.0

package/LICENSE

@@ -1,11 +1,11 @@
-Copyright 2023 An Pham
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
+Copyright 2023 An Pham
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/index.d.ts

@@ -1,5 +1,5 @@
-import type { DbConstructor } from '../types/lib';
-
-declare const Db: DbConstructor;
-
+import type { DbConstructor } from '../types/lib';
+
+declare const Db: DbConstructor;
+
 export = Db;

package/index.js

@@ -62,7 +62,7 @@ class Db extends core_1.ClientDb {
     static getPoolConfig(source) {
         return POOL_CONFIG.get(source);
     }
-    setCredential(item) {
+    async setCredential(item) {
         try {
             return this.getClient(item.source).setCredential.call(this, item);
         }
@@ -93,7 +93,36 @@ class Db extends core_1.ClientDb {
             return false;
         }
     }
-    executeQuery(item, options) {
+    applyCommand(...items) {
+        let settings;
+        for (let i = 0, length = items.length; i < length; ++i) {
+            const item = items[i];
+            const command = item.withCommand;
+            if (!command) {
+                continue;
+            }
+            if (!settings && !(0, types_1.isPlainObject)(settings = this.getUserSettings()?.[item.source]?.commands)) {
+                return;
+            }
+            let name, table;
+            const [group, procedure] = Array.isArray(command) ? command : ({ name, table } = item, [(name || table ? name && table ? name + ':' + table : table || name : typeof item.document === 'string' && item.document) || '', command]);
+            const data = settings[group]?.[procedure];
+            if (!(0, types_1.isPlainObject)(data)) {
+                continue;
+            }
+            if ('uri' in data) {
+                delete data.uri;
+            }
+            if ('credential' in data) {
+                delete data.credential;
+            }
+            if ('usePool' in data) {
+                delete data.usePool;
+            }
+            Object.assign(item, data);
+        }
+    }
+    async executeQuery(item, options) {
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
@@ -104,7 +133,7 @@ class Db extends core_1.ClientDb {
             return Promise.reject(err);
         }
     }
-    executeBatchQuery(batch, options, outResult) {
+    async executeBatchQuery(batch, options, outResult) {
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
@@ -115,7 +144,7 @@ class Db extends core_1.ClientDb {
             return Promise.reject(err);
         }
     }
-    processRows(batch, tasks, parallel, outResult) {
+    async processRows(batch, tasks, parallel, outResult) {
         let disconnect;
         if ((0, types_1.isObject)(parallel)) {
             ({ disconnect, parallel } = parallel);
@@ -142,11 +171,11 @@ class Db extends core_1.ClientDb {
             return [];
         };
         if (tasks.length === 0) {
-            return Promise.resolve(cleanup());
+            return cleanup();
         }
         if (!parallel && outResult) {
             terminate();
-            return Promise.resolve(outResult);
+            return outResult;
         }
         return Promise.all(tasks)
             .then(result => {
@@ -167,31 +196,31 @@ class Db extends core_1.ClientDb {
         if (options && typeof options.errorQuery === 'function') {
             if (options.errorQuery(err, item, options.commandType)) {
                 if (item.willAbort) {
-                    this.abort();
+                    this.abort(err);
                 }
                 return true;
             }
         }
         else {
             if (item.willAbort) {
-                this.abort();
+                this.abort(err);
             }
             this.writeFail(["Unable to execute query" /* ERR_DB.EXEC_QUERY */, item.source], err, 65536 /* LOG_TYPE.DB */);
         }
         return false;
     }
-    commit(items) {
+    async commit(items) {
         if (this.aborted) {
             return Promise.reject((0, types_1.createAbortError)());
         }
-        const tasks = (items || this.pending).map(data => {
+        const tasks = (items || this.pending).map(async (data) => {
             data.ignoreCache ?? (data.ignoreCache = true);
             return this.executeQuery(data).catch(() => {
                 this.applyState([data], 16 /* DB_TRANSACTION.ABORT */);
                 return [];
             });
         });
-        return tasks.length === 0 ? Promise.resolve(false) : this.allSettled(tasks, ["Execute unassigned queries" /* VAL_DB.EXEC_QUERYUNASSIGNED */, this.moduleName]).then(result => result.length > 0).catch(() => false);
+        return tasks.length === 0 ? false : this.allSettled(tasks, ["Execute unassigned queries" /* VAL_DB.EXEC_QUERYUNASSIGNED */, this.moduleName]).then(result => result.length > 0).catch(() => false);
     }
     readTLSCert(value, cache) {
         if ((0, types_1.isString)(value)) {
@@ -226,10 +255,10 @@ class Db extends core_1.ClientDb {
     }
     resolveSource(source, folder) {
         let result;
-        if (source[0] !== '@') {
+        if (!source.startsWith('@')) {
             result = this.settings.imports?.[source] || util_1.IMPORTS[source];
         }
-        else if (!folder && source.indexOf('/') === -1) {
+        else if (!folder && !source.includes('/')) {
             folder = 'client';
         }
         return (result || source) + (folder ? '/' + folder : '');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/db",
-  "version": "0.7.1",
+  "version": "0.8.0",
   "description": "DB modules for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,8 +20,8 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/core": "0.7.1",
-    "@e-mc/request": "0.7.1",
-    "@e-mc/types": "0.7.1"
+    "@e-mc/core": "0.8.0",
+    "@e-mc/request": "0.8.0",
+    "@e-mc/types": "0.8.0"
   }
 }

package/pool.d.ts

@@ -1,5 +1,5 @@
-import type { DbPoolConstructor } from '../types/lib/db';
-
-declare const DbPool: DbPoolConstructor;
-
+import type { DbPoolConstructor } from '../types/lib/db';
+
+declare const DbPool: DbPoolConstructor;
+
 export = DbPool;

package/pool.js

@@ -88,9 +88,12 @@ class DbPool {
             delete parent[this.poolKey];
         }
     }
-    detach(force) {
+    async detach(force) {
         this.remove();
-        return this.closed ? Promise.resolve() : force ? this.close().catch(() => { }) : this.close();
+        if (this.closed) {
+            return;
+        }
+        return force ? this.close().catch(() => { }) : this.close();
     }
     isIdle(timeout) {
         if (this.closed) {