@e-mc/db 0.0.2 → 0.0.4

package/index.js

@@ -120,7 +120,7 @@ class Db extends core_1.ClientDb {
             ({ disconnect, parallel } = parallel);
         }
         const terminate = () => {
-            this.applyState(batch, 8 /* TRANSACTION_DB.TERMINATE */);
+            this.applyState(batch, 8 /* DB_TRANSACTION.TERMINATE */);
             if (typeof disconnect === 'function') {
                 try {
                     disconnect();
@@ -130,7 +130,7 @@ class Db extends core_1.ClientDb {
             }
         };
         const cleanup = () => {
-            this.applyState(batch, 16 /* TRANSACTION_DB.ABORT */);
+            this.applyState(batch, 16 /* DB_TRANSACTION.ABORT */);
             terminate();
             if (outResult) {
                 for (let i = 0, length = outResult.length; i < length; ++i) {
@@ -161,7 +161,7 @@ class Db extends core_1.ClientDb {
             .catch(() => cleanup());
     }
     handleFail(err, item, options) {
-        this.add(item, 32 /* TRANSACTION_DB.FAIL */);
+        this.add(item, 32 /* DB_TRANSACTION.FAIL */);
         item.transactionFail = true;
         if (options && typeof options.errorQuery === 'function') {
             if (options.errorQuery(err, item, options.commandType)) {
@@ -186,7 +186,7 @@ class Db extends core_1.ClientDb {
         const tasks = (items || this.pending).map(data => {
             data.ignoreCache ?? (data.ignoreCache = true);
             return this.executeQuery(data).catch(() => {
-                this.applyState([data], 16 /* TRANSACTION_DB.ABORT */);
+                this.applyState([data], 16 /* DB_TRANSACTION.ABORT */);
                 return [];
             });
         });
@@ -224,18 +224,26 @@ class Db extends core_1.ClientDb {
         }
     }
     resolveSource(source, folder) {
-        let result, sep = path.sep;
-        if (source[0] === '@') {
-            if ((result = source).indexOf('/') === -1) {
-                folder || (folder = 'client');
+        let result;
+        if (source[0] !== '@') {
+            switch (source) {
+                case 'mongodb':
+                case 'mssql':
+                case 'mysql':
+                case 'oracle':
+                case 'postgres':
+                case 'redis':
+                    result = '@e-mc2/' + source;
+                    break;
+                default:
+                    result = source;
+                    break;
             }
-            sep = '/';
         }
-        else if (!Db.isDir(result = path.join(__dirname, source))) {
-            result = source;
-            sep = '/';
+        else if ((result = source).indexOf('/') === -1) {
+            folder || (folder = 'client');
         }
-        return result + (folder ? sep + folder : '');
+        return result + (folder ? '/' + folder : '');
     }
     getPoolConfig(source, uuidKey) {
         const config = Db.getPoolConfig(source);

package/package.json

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

package/mongodb/index.d.ts

@@ -1,12 +0,0 @@
-import type { MongoDBDataSource, MongoDBFilterValue, MongoDBSortValue } from '../../types/lib/db';
-
-import type { IDbSourceClient } from '../types';
-
-import type { CommandOperationOptions, Document, Filter, Sort, SortDirection } from 'mongodb';
-
-declare const MongoDB: IDbSourceClient<MongoDBDataSource> & {
-    getFilterValue: (query: Filter<Document> | MongoDBFilterValue, coerce?: boolean) => [Filter<Document>, CommandOperationOptions?];
-    getSortValue: (sort: Sort | string | MongoDBSortValue, coerce?: boolean) => [Sort | string, SortDirection?];
-};
-
-export = MongoDB;